Skip to content

[pull] master from mattermost:master - #870

Merged
pull[bot] merged 8 commits into
code:masterfrom
mattermost:master
Jul 28, 2026
Merged

[pull] master from mattermost:master#870
pull[bot] merged 8 commits into
code:masterfrom
mattermost:master

Conversation

@pull

@pull pull Bot commented Jul 28, 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 : )

esarafianou and others added 8 commits July 28, 2026 10:59
…Guide > Collaborate) (#37663)

* docs(sidebar): support 3 levels of TOC nesting for End User Guide > Collaborate

Addresses item 6 of Eric Sethna's docs revamp feedback ("Can we support
three levels of nesting in the TOC? ... ie End-user guide > Collaborate").

PR #37630 (open, not merged) applies the manual-grouping-override pattern
to Administration Guide > Onboard/Scale but doesn't touch End User Guide,
and the pattern isn't a shared generic engine — each section gets its own
small builder/regroup pair. This adds that pair for Collaborate
(COLLABORATE_GROUPS/COLLABORATE_ORDER/COLLABORATE_HIDDEN +
buildCollaborateItem/regroupCollaborate/buildEndUserGuideSidebar),
regrouping its 49 flat files into Channels, Messaging & Threads, Calls &
Screen Sharing, Teams/Groups & Roles, Integrations & Connected Apps, and
Keyboard Shortcuts & Accessibility — giving End User Guide > Collaborate >
[group] > page, a genuine 3rd nesting level. Files stay flat on disk; no
URLs move.

Co-authored-by: Cursor <cursoragent@cursor.com>

* docs(sidebar): support inline subgroup specs in buildCollaborateItem

Addresses CodeRabbit review comment on #37663: buildCollaborateItem only
handled spec.group lookups, unlike buildAdminManageItem which also
supports inline {label, items} subgroup specs (used e.g. for the
Attribute-Based Access Control 4-level nesting under Admin Manage).
Detect spec.items before falling back to the COLLABORATE_GROUPS lookup
so Collaborate can gain the same nested-subgroup capability if needed,
without changing today's generated sidebar output.

Co-authored-by: Cursor <cursoragent@cursor.com>

* docs(sidebar): merge Collaborate regroup with master's agents-docs promotion

Rebasing onto master surfaced a duplicate 'buildEndUserGuideSidebar'
declaration: master gained its own End User Guide override (promoting
the Agents plugin's usage-tips page, from #37627) after this branch was
cut, so git's non-conflicting merge silently produced two function
bodies with the same name — a SyntaxError caught by CI's docs build
check, not by the rebase itself.

Merged both overrides into a single buildEndUserGuideSidebar: keeps the
agents usage-tips promotion from master, plus this branch's Collaborate
regrouping into COLLABORATE_GROUPS. Verified with a clean
'npm run build:sidebars' run (zero warnings) after initializing the
docs/vendor/mattermost-plugin-agents submodule locally to stage agents
docs first.

Co-authored-by: Cursor <cursoragent@cursor.com>

* docs(sidebar): clarify TOC nesting depth wording, reorder Collaborate items

- README: describe the inline sub-group nesting as a third category
  level / four-level path instead of ambiguous "3rd level" wording.
- Move invite-people out of the mismatched "Teams, Groups & Roles"
  group into its own top-level Collaborate entry, placed first.
- Reorder "Teams, Groups & Roles" so learn-about-roles leads the group.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
* add testcontainers to playwright-lib

* include retry mechanism for transient failures

* - Introduced a new command `testcontainers:up` in package.json to run Playwright tests with Testcontainers.
- Created a standalone Playwright configuration file `playwright.testcontainers-up.config.ts` for managing Testcontainers.
- Added a no-op test `testcontainers_up.spec.ts` to ensure the Testcontainers stack is up during the test run.
- Implemented a global setup script `testcontainers_up_global_setup.ts` to start and stop the Testcontainers stack.
- Updated dependencies in package.json, including adding `chalk` for logging.

* fix package-lock

* fix tsc and restore waiting for all migrations to complete

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
The mobile navbar slide-out (.navbar-sidebar) always has a dark denim
background regardless of theme, but its menu links inherited the
light-mode --ifm-menu-color* values tuned for the light desktop
sidebar, rendering dark navy text on a dark navy panel. Scope the
dark-on-dark ("readable on dark") menu color values to .navbar-sidebar
unconditionally, and fix the "Back to main menu" button's text color
which was relying on the same now-changed background.

Co-authored-by: Cursor <cursoragent@cursor.com>
#37630)

* docs(sidebar): regroup Administration Guide Onboard and Scale sections

Onboard (34 files) and Scale (28 files) were still flat, unrouped lists
unlike their already-regrouped Configure/Manage/Integrations siblings.
Apply the same manual-grouping-override pattern:

- Onboard: SAML SSO, Other SSO & Identity (OAuth/OIDC/AD-LDAP),
  Multi-Factor & Certificate Auth, Guest Accounts & Delegated
  Administration, User Provisioning & Bulk Data, Migrating to Mattermost.
- Scale: Capacity Planning (scale-to-N-users pages + storage sizing),
  High Availability & Architecture, Search Infrastructure, Observability
  & Monitoring, Caching — with Scaling for Enterprise kept as a standalone
  landing page since it's a general entry point, not a group member.

Extends the existing orphan-check warning logic in buildAdminGuideSidebar
to also cover Onboard/Scale, so future filesystem drift surfaces the same
way it already does for Configure/Manage. Files stay flat on disk, no
URLs move.

Co-authored-by: Cursor <cursoragent@cursor.com>

* docs(sidebar): align Onboard/Scale subgroups with Sphinx's live nav

Sphinx's actual toctree groups these files differently than the initial
regroup guessed: SAML/OAuth/OIDC/AD-LDAP all live under one identity
bucket (not split SAML vs "other"), guest/permissions pages sit under a
plain "User management" label, and — most notably — 21 of Scale's 28
files (capacity planning, HA/architecture, search infra, caching) are
navigated to from Deployment Guide -> Reference Architecture in Sphinx,
not Administration Guide, even though their Sphinx URLs stay under
/administration-guide/scale/.

- Merge Onboard's samlSso/otherSso groups into one "SSO & Identity"
  group, with SAML nested as its own sub-category inside it.
- Rename "Guest Accounts & Delegated Administration" to "User
  Management".
- Physically move the 21 Scale files that Sphinx navigates to from
  Deployment Guide into deployment-guide/reference-architecture/scale/,
  and add a new `scaling` group to DEPLOYMENT_GROUPS mirroring that
  split. Administration Guide -> Scale keeps only the 7
  monitoring/observability pages.
- Rewrite the ~130 internal .mdx links that pointed at the old
  /administration-guide/scale/* paths for the moved files, and update
  the 31 matching Sphinx->Docusaurus redirect targets in
  active-redirects.json.

Regenerated the sidebar with zero orphan warnings; all files accounted
for exactly once.

Co-authored-by: Cursor <cursoragent@cursor.com>

* docs(sidebar): flatten Scale's remaining Observability & Monitoring group

With the 21 architecture/capacity/search files moved to Deployment Guide,
Scale is down to 7 monitoring pages under one theme — wrapping them in
their own "Observability & Monitoring" sub-category just adds a redundant
nesting level (Scale > Observability & Monitoring > 7 files). List them
flat directly under Scale instead.

Co-authored-by: Cursor <cursoragent@cursor.com>

* docs(sidebar): move Calls docs to deployment-guide, dissolve Storage & Database group

Calls (RTCD, offloader, Kubernetes, logging, metrics) is a deployment/
operations concern, not settings-reference material — physically move the
6 Calls docs from administration-guide/configure/ into a new
deployment-guide/calls/ directory and add a matching `calls` group to
DEPLOYMENT_GROUPS, slotted right after Server/Scaling. Rewrite every
cross-reference across docs/ (including the two PDF book manifests) to the
new /deployment-guide/calls/calls-* paths, and add/update the matching
active-redirects.json entries so old URLs keep resolving.

Also dissolve the "Storage & Database" group in Configure — its three
pages (configuration-in-your-database, environment-variables,
azure-blob-storage) become plain top-level entries instead of a
single-purpose subgroup; no files move since their URLs are unchanged.

Co-authored-by: Cursor <cursoragent@cursor.com>

* docs(calls,scale): fix RST-migration artifacts and stale links flagged in review

Fixes still-valid review findings on the Calls/Scale content moved in this
branch:

- calls-metrics-monitoring.mdx: unescape HTML-entity braces in inline RTCD
  metric names (&#123;/&#125; -> {}), which is unnecessary in fenced/inline
  code and rendered literally; convert two legacy docs.mattermost.com
  absolute links to root-relative internal links, pointing the
  Prometheus/Grafana link at its current post-move location under
  deployment-guide/reference-architecture/scale/ rather than the stale
  administration-guide/scale/ path.
- calls-rtcd-setup.mdx: convert the ICE Host Override link to a
  root-relative path; convert two leftover Sphinx ```{note}``` fences to
  the <Note> component (one of these was rendering as barely-readable
  plain text due to being an unrecognized code-fence language, not a
  proper admonition); add a <Warning> ahead of the community-maintained
  installation scripts link.
- elasticsearch-setup.mdx: remove a stray leftover ":start-after:
  :nosearch:" Sphinx directive rendering as literal page text.
- opensearch-setup.mdx: remove blockquote (`>`) prefixes wrapping every
  numbered-step code fence (another RST-migration artifact), convert a
  raw <div class="note"> to <Note>, and unescape HTML-entity braces/angle
  brackets in the YAML/JSON/Terraform examples.
- deploy-rhel.mdx: fix the "RTCD setup and configuration" link to point
  at calls-rtcd-setup instead of the general calls-deployment-guide page.
- pdf/books/deployment-guide.json: add the two Calls pages missing from
  the PDF spine (calls-metrics-monitoring, calls-rtcd-setup).

Skipped: the raw entity-escaped `{}` in calls-rtcd-setup.mdx's <style>
block is intentional (real JSX context, not a code fence/span) and the
"code comment colors nearly invisible" screenshot turned out to be the
same {note}-fence bug above, not a separate Prism/CSS issue -- fixed by
the <Note> conversion. Two more Sphinx ```{note}``` fences exist in
administration-guide/onboard/sso-saml-keycloak.mdx and
sso-saml-adfs-msws2016.mdx but weren't part of the flagged findings, so
left untouched.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
@pull pull Bot locked and limited conversation to collaborators Jul 28, 2026
@pull pull Bot added the ⤵️ pull label Jul 28, 2026
@pull
pull Bot merged commit f6c1459 into code:master Jul 28, 2026
5 checks passed
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.

4 participants