[pull] master from mattermost:master#683
Merged
Merged
Conversation
…on (#36421) When two servers race through doSetupContentFlaggingProperties simultaneously (e.g. HA deployments or parallel CI tests sharing a DB), both read the same UpdateAt timestamps for existing property fields and both call UpdatePropertyFields. The store's optimistic concurrency control causes the second writer to get ErrConflict. Since both servers are writing identical expected values, tolerate the conflict the same way the create path already does. Adds a regression test that fires 5 concurrent goroutines at the migration after fields already exist, verifying all succeed.
…6424) * MM-68647: Fix Data Spillage reviewer pill background in dark mode The SelectableUserPropertyRenderer wraps a react-select component using a UserMultiSelector classNamePrefix, so the global .react-select styles in _react-select.scss did not apply. As a result the inner control kept its default white react-select background, which clashed with dark themes when viewing the Data Spillage reviewer field. Make the control transparent and ensure the value/placeholder/input/menu all use theme-driven colors so the reviewer pill blends correctly in both light and dark mode. Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com> * Fix stylelint: order color before gap in placeholder Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Automatic Merge
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 : )