Skip to content

[pull] master from mattermost:master - #915

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

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

Conversation

@pull

@pull pull Bot commented Aug 17, 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 : )

hanzei and others added 3 commits August 17, 2026 10:11
Remove the deprecated backward-compatibility aliases introduced in #35445:
SlackAttachment, SlackAttachmentField, ParseSlackAttachment, and
StringifySlackFieldValue. Plugins should now use the MessageAttachment
equivalents directly.

SlackCompatibleBool is retained as it is still actively used.


Claude-Session: https://claude.ai/code/session_01KnMUsaSbm4HQsNEEtH5zp8

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
…ings (#38004)

* [MM-70283] Fix mixed custom-section fallback hiding valid fallback settings

When a disabled plugin defined multiple custom settings sections and only
some specified fallback: true, the settings page collapsed every section
into a single "enable the plugin" warning, hiding the fallback-enabled
sections that should remain configurable.

The collapse now only happens when no custom section allows a fallback.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* [MM-70283] Add test for mixed custom-section fallback

Covers a disabled plugin with mixed fallback sections: the fallback-enabled
section stays configurable, the non-fallback section shows a per-section
warning, and the single collapse warning is not rendered.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* [MM-70283] Improve mixed custom-section fallback tests

Rename the visibility test to match its assertions, add an
order-independent case, and assert non-fallback section settings are
suppressed.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* [MM-70283] Tighten fallback comment wording

Co-authored-by: mattermost-code <matty-code@mattermost.com>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: mattermost-code <matty-code@mattermost.com>
…odal (#37202)

* Add delegated administration roles to Manage Roles modal

Allow admins to grant custom (delegated granular administration) roles
directly from the System Console > Users > Manage Roles modal, instead of
only via Delegated Granular Administration.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* Add tests for delegated administration roles in Manage Roles modal

Cover rendering, pre-checking, availability filtering, bot handling,
merge/remove on save, ordering, admin/member toggling, save errors,
modal close, and user-switch state reset.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* Fix lint in manage roles modal test

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* Address PR feedback: link to system roles page and refine delegated roles spacing

- Replace per-role subtext with a single help-text link to the System Roles
  page, since customized roles can differ from the default descriptions
- Add padding below the radio buttons above the divider
- Left-align the delegated roles section with the section above and add
  padding below the divider

* Address PR feedback: license-gate delegated roles, refine help text, dedupe SCSS

* Assert delegated roles help text and link in modal tests

* Address PR feedback: gate delegated roles by Enterprise license (exclude Entry), hide for system admins, add Personal Access Tokens section heading

* Add e2e tests for delegated admin roles in Manage Roles modal

* Drop unused radio locator from ManageRolesModal page object

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: mattermost-code <matty-code@mattermost.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
@pull pull Bot locked and limited conversation to collaborators Aug 17, 2026
@pull pull Bot added the ⤵️ pull label Aug 17, 2026
@pull
pull Bot merged commit fd62fe4 into code:master Aug 17, 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.

1 participant