Skip to content

[pull] master from mattermost:master#746

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

[pull] master from mattermost:master#746
pull[bot] merged 4 commits into
code:masterfrom
mattermost:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Jun 2, 2026

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 4 commits June 2, 2026 14:11
* Fix flaky TestCheckUsersEmojiIntegrity

Integrity checks scan the full database for orphaned emoji rows, so
parallel sqlstore tests and leftover rows from sibling tests can inflate
global record counts and flip index-based assertions.

Reset tables at test start and scope the one-record assertion to the
emoji child ID created in that subtest.

Tests-only change. Verified compilation locally; full test loop requires
PostgreSQL (CI).

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

* ci: nudge CodeRabbit after all checks green

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

* Address PR feedback: 1 items resolved, 0 declined

* Use t.Cleanup with require.NoError for emoji test fixture cleanup

Replace silent defer dbmap.Exec cleanup calls with t.Cleanup handlers
that assert on errors, addressing CodeRabbit review feedback.

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>
* DEleted removed post from content flagging redux store

* Create a separate action
…ownload rejections) (#36838)

* Surface plugin upload rejections as a toast (parity with download rejections)

* add some tests
)

* Add server config to disable auto-follow on channel-wide mentions

Adds `ServiceSettings.ChannelMentionAutoFollowThreads` (default: true)
which, when disabled, prevents @channel/@here/@ALL mentions in thread
replies from automatically adding users as thread followers. Users still
receive mention notifications; only the thread membership is skipped.

* Refactor: move channel-mention auto-follow to per-user notification setting

Replaces the server-level ServiceSettings.ChannelMentionAutoFollowThreads
config with a per-user notification preference
channel_mention_auto_follow_threads (default: true).

Users can now opt out individually via Notification Settings ->
"Auto-follow threads on channel-wide mentions" (placed above
"Keywords that trigger notifications"), without requiring admin
intervention. Behavior is unchanged for users who have not modified the
setting.

* Add additional test case

* linter fixes and webapp snapshot update

* update user setting description

* em dash removed in description

* Update E2E tests

* prettier:fix

---------

Co-authored-by: gtsaturyan <gtsaturyan@ozon.ru>
Co-authored-by: Harrison Healey <harrisonmhealey@gmail.com>
@pull pull Bot locked and limited conversation to collaborators Jun 2, 2026
@pull pull Bot added the ⤵️ pull label Jun 2, 2026
@pull pull Bot merged commit 127552c into code:master Jun 2, 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.

3 participants