Skip to content

[pull] master from mattermost:master - #946

Merged
pull[bot] merged 1 commit into
code:masterfrom
mattermost:master
Aug 29, 2026
Merged

[pull] master from mattermost:master#946
pull[bot] merged 1 commit into
code:masterfrom
mattermost:master

Conversation

@pull

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

* Add ESLint rule to dedupe System Console config dependencies

Introduce @mattermost/no-redundant-admin-config-deps so admin_definition
settings that depend on a bool parent via stateIsFalse do not repeat that
parent's config/state isDisabled checks, matching the dependency-tree
approach discussed on #38024.

Co-authored-by: Jesse Hallam <lieut-data@users.noreply.github.com>

* Remove redundant System Console isDisabled config checks

Drop duplicated parent config/state conditions from SAML and OAuth DCR
settings now covered by bool parent dependencies, as enforced by
@mattermost/no-redundant-admin-config-deps.

Co-authored-by: Jesse Hallam <lieut-data@users.noreply.github.com>

* Attribute redundant admin config deps to closest parent

Build the full bool-parent dependency tree before reporting, then pick the
most specific immediate parent that implies a condition so grandparent-first
declaration order cannot mislabel the fix target.

Co-authored-by: Jesse Hallam <lieut-data@users.noreply.github.com>

* Fix eslint-plugin lint violations in admin config deps rule

Resolve no-nested-ternary, wrap-regex, no-unused-vars, no-underscore-dangle,
and lines-around-comment issues so Web App CI check-lint passes on the new
rule and its tests.

Co-authored-by: Jesse Hallam <lieut-data@users.noreply.github.com>

* Harden admin config deps rule for regex keys and parent parse

Keep distinct regex patterns from collapsing to the same canonicalize
key, and skip non-JSON identifier parent args instead of throwing.

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

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Jesse Hallam <lieut-data@users.noreply.github.com>
Co-authored-by: mattermost-code <matty-code@mattermost.com>
@pull pull Bot locked and limited conversation to collaborators Aug 29, 2026
@pull pull Bot added the ⤵️ pull label Aug 29, 2026
@pull
pull Bot merged commit f8a5beb into code:master Aug 29, 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