Skip to content

[pull] master from mattermost:master - #943

Merged
pull[bot] merged 3 commits into
code:masterfrom
mattermost:master
Aug 27, 2026
Merged

[pull] master from mattermost:master#943
pull[bot] merged 3 commits into
code:masterfrom
mattermost:master

Conversation

@pull

@pull pull Bot commented Aug 27, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

lieut-data and others added 3 commits August 27, 2026 12:35
…nfiguration > Users and Teams (#38025)

* [MM-57805] Graduate account deactivation setting to Users and Teams

Move TeamSettings.EnableUserDeactivation out of System Console >
Experimental > Features and into System Console > Site Configuration >
Users and Teams, alongside the other account lifecycle settings.

The config key, its default, and its runtime behavior are unchanged. The
access tag moves from experimental_features to site_users_and_teams so
the setting is governed by sysconsole_read/write_site_users_and_teams,
and the i18n ids move from admin.experimental.* to the Users and Teams
page's admin.team.* convention.

Documentation moves from the experimental configuration settings page to
the Users and teams section of the site configuration settings page, and
the end user advanced options guide is repointed at the new anchor.

* [MM-57820] Graduate user status away timeout to Users and Teams

Move TeamSettings.UserStatusAwayTimeout out of System Console >
Experimental > Features and into System Console > Site Configuration >
Users and Teams, next to the other user status and presence settings.

The config key, its default of 300, and its seconds-based semantics are
unchanged. The access tag moves from experimental_features to
site_users_and_teams, and the i18n ids move from admin.experimental.* to
the Users and Teams page's admin.team.* convention.

The label now reads "User Status Away Timeout (seconds):" so the unit
stays obvious outside the Experimental page, matching how other
seconds-based timeouts are labelled in the System Console.

Documentation moves from the experimental configuration settings page to
the Users and teams section of the site configuration settings page.

* Clarify help text for account deactivation and away timeout settings

* fixup! Clarify help text for account deactivation and away timeout settings

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: mattermost-code <matty-code@mattermost.com>
* [MM-57807] Graduate Hardened Mode to Environment > Web Server

Hardened Mode is a production security control, but it was only reachable
from System Console > Experimental > Features, which led admins to doubt
it was supported for production use.

Move Hardened Mode to Environment > Web Server, where the other
server-side transport and API hardening toggles already live, and
reclassify its access tag from experimental_features to
environment_web_server so it is gated by
sysconsole_{read,write}_environment_web_server.

The config key is renamed from ExperimentalEnableHardenedMode to
EnableHardenedMode. On first load after upgrade, SetDefaults migrates any
existing ExperimentalEnableHardenedMode: true to the new key and clears
the old one, so no manual config change is required.

* Fix hyphen in hardened mode docs (user-facing)

* Initialize ExperimentalEnableHardenedMode to false when nil

Symmetric with other *bool settings in SetDefaults. The deprecated field
is now always non-nil after initialization; its value still seeds
EnableHardenedMode when that field is unset.

* fixup! Initialize ExperimentalEnableHardenedMode to false when nil

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
@pull pull Bot locked and limited conversation to collaborators Aug 27, 2026
@pull pull Bot added the ⤵️ pull label Aug 27, 2026
@pull
pull Bot merged commit 441e45a into code:master Aug 27, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants