Skip to content

[pull] master from mattermost:master#780

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

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

Conversation

@pull

@pull pull Bot commented Jun 18, 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 : )

cursor Bot and others added 3 commits June 17, 2026 17:06
…ise (#37060)

* Add Classification Markings discovery page for non-Enterprise licenses

Surface a feature discovery/upsell page in the System Console when the
ClassificationMarkings feature flag is enabled but the license tier is
below Enterprise (e.g. Professional). Previously the page was hidden
entirely, so the feature was never surfaced to admins.

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

* Add tests for Classification Markings discovery gating

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

* Add render test and expand gating coverage for Classification Markings discovery

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

* Assert feature flag gate overrides license for Classification Markings

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

* Run i18n-extract for Classification Markings discovery strings

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

* Fix broken learn more URL for Classification Markings discovery page

The classification markings documentation page does not exist yet, causing
check-external-links CI to fail. Use the CMMC compliance guide which covers
system-wide and channel-specific classification banners.

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

* Use nullish coalescing for SVG dimension defaults

Address CodeRabbit feedback: honor explicit 0 width/height values instead
of treating them as missing.

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

* Address PR feedback: 0 answered, 1 resolved, 0 declined

---------

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 Jun 18, 2026
@pull pull Bot added the ⤵️ pull label Jun 18, 2026
@pull pull Bot merged commit 9defd98 into code:master Jun 18, 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