forked from mattermost/mattermost
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[pull] master from mattermost:master #167
Open
pull
wants to merge
164
commits into
ctlaltdieliet:master
Choose a base branch
from
mattermost:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+14,020
−7,541
Conversation
This file contains 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
…es (#30090) Bumps the github-actions-updates group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/setup-node](https://github.com/actions/setup-node) | `4.1.0` | `4.2.0` | | [docker/build-push-action](https://github.com/docker/build-push-action) | `6.10.0` | `6.13.0` | | [github/codeql-action](https://github.com/github/codeql-action) | `3.27.9` | `3.28.8` | | [tj-actions/changed-files](https://github.com/tj-actions/changed-files) | `45.0.5` | `45.0.6` | | [getsentry/action-release](https://github.com/getsentry/action-release) | `1.7.0` | `1.9.0` | | [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) | `4.0.2` | `4.0.3` | | [mikepenz/action-junit-report](https://github.com/mikepenz/action-junit-report) | `5.2.0` | `5.3.0` | Updates `actions/setup-node` from 4.1.0 to 4.2.0 - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@39370e3...1d0ff46) Updates `docker/build-push-action` from 6.10.0 to 6.13.0 - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@48aba3b...ca877d9) Updates `github/codeql-action` from 3.27.9 to 3.28.8 - [Release notes](https://github.com/github/codeql-action/releases) - [Commits](github/codeql-action@v3.27.9...v3.28.8) Updates `tj-actions/changed-files` from 45.0.5 to 45.0.6 - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](tj-actions/changed-files@bab30c2...d6e91a2) Updates `getsentry/action-release` from 1.7.0 to 1.9.0 - [Release notes](https://github.com/getsentry/action-release/releases) - [Changelog](https://github.com/getsentry/action-release/blob/master/CHANGELOG.md) - [Commits](getsentry/action-release@e769183...f6dfa3d) Updates `aws-actions/configure-aws-credentials` from 4.0.2 to 4.0.3 - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](aws-actions/configure-aws-credentials@e3dd6a4...4fc4975) Updates `mikepenz/action-junit-report` from 5.2.0 to 5.3.0 - [Release notes](https://github.com/mikepenz/action-junit-report/releases) - [Commits](mikepenz/action-junit-report@62516aa...ee6b445) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-updates - dependency-name: getsentry/action-release dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-updates - dependency-name: mikepenz/action-junit-report dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add SelectBuilderCtx; change the few calls where it's appropriate to use * tests (wip) * tests improved * use SelectCtx's own WithTimeout * improve tests based on PR feedback --------- Co-authored-by: Mattermost Build <build@mattermost.com>
When the client side metrics were added constLabels got missed out. Without this, we cannot do the high level grouping by rings. https://mattermost.atlassian.net/browse/MM-62901 ```release-note NONE ```
https://mattermost.atlassian.net/browse/MM-60211 ```release-note NONE ``` Co-authored-by: Mattermost Build <build@mattermost.com>
* Revert "Revert "[MM-62142] Avoid SELECT * in status_store.go (#29610)" (#29985)" This reverts commit d345e92. * add tests for StatusGet and StatusGetByIds * handle NULL columns in the Status Store * simplify status store * more builder simplifications and tests * expose GetQueryPlaceholder --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Automatic Merge
* Updates to cloud specific imagery in system console * Revert something from images * Fix linter * Updates from PR feedback * Fix lint * Add svg * Lint fixes, update another SVG * change to pre-existing already-themed version of svg * change the folder of the file * add file * Adjust styling
I had previously made a change to check `github.ref`, not realizing that this particular workflow always runs from `master` from a workflow completed on a different branch. Use `github.event.workflow_run.head_branch` instead.
* refractored sql queries * GetBuilder to Select Builder as preferences is slice (fix failing test) * test: Add test for GetCategoryAndName preference method * fix s/GetBuilder/SelectBuilder * linting * make mocks * make store-layers --------- Co-authored-by: Jesse Hallam <jesse.hallam@gmail.com>
https://mattermost.atlassian.net/browse/MM-61215 ```release-note NONE ``` Co-authored-by: Mattermost Build <build@mattermost.com>
* Upgraded boards version to v9.1.0 * Update server/Makefile Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com> --------- Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>
We were redirecting any logging happening via the Go standard logger to our own mlog instance. The issue is that all those logs were happening at LvlStdLog level which is higher than LvlDebug. LvlStdLog is at 10, and LvlDebug is at 5. So unless a customer sets the log level specifically to "stdlog" or sets up advanced logging to specifically log for that level, no standard logs will ever get logged. We fix this by logging it at warn level. The reason for warn is that mostly external libraries use this facility to log out-of-band errors that could not be returned using standard error returns. I saw another plugin error which was logged similarly. This was never surfaced before due to this bug. https://mattermost.atlassian.net/browse/MM-62926 ```release-note NONE ```
Bumps the github-actions-updates group with 5 updates: | Package | From | To | | --- | --- | --- | | [github/codeql-action](https://github.com/github/codeql-action) | `3.28.8` | `3.28.9` | | [tj-actions/changed-files](https://github.com/tj-actions/changed-files) | `45.0.6` | `45.0.7` | | [getsentry/action-release](https://github.com/getsentry/action-release) | `1.9.0` | `1.10.3` | | [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) | `3.7.0` | `3.8.0` | | [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) | `3.8.0` | `3.9.0` | Updates `github/codeql-action` from 3.28.8 to 3.28.9 - [Release notes](https://github.com/github/codeql-action/releases) - [Commits](github/codeql-action@v3.28.8...v3.28.9) Updates `tj-actions/changed-files` from 45.0.6 to 45.0.7 - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](tj-actions/changed-files@d6e91a2...dcc7a0c) Updates `getsentry/action-release` from 1.9.0 to 1.10.3 - [Release notes](https://github.com/getsentry/action-release/releases) - [Changelog](https://github.com/getsentry/action-release/blob/master/CHANGELOG.md) - [Commits](getsentry/action-release@f6dfa3d...12bba0b) Updates `sigstore/cosign-installer` from 3.7.0 to 3.8.0 - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](sigstore/cosign-installer@dc72c7d...c56c2d3) Updates `docker/setup-buildx-action` from 3.8.0 to 3.9.0 - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@6524bf6...f7ce87c) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-updates - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-updates - dependency-name: getsentry/action-release dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: Add initial store configuration for webapp channels * refactor: Convert store/index.js to TypeScript with type definitions * test: Add initial test file for store index * refactor: Convert index.test.js to TypeScript with type annotations * Removing old files * Applying linter fixes * Fixing some of the types errors * fix: Type mock implementation of getState in global_actions.test.ts * test: Add missing GlobalState import in global_actions.test.ts * fix: Resolve TypeScript mock implementation error in global_actions.test.ts * Some fixes * Address CI problems * Installing zen-observable types * Addressing PR review comment * Addressing PR review comment * Addressing PR review comment * Addressing PR review comment * Addressing PR review comment * Simpliying things * Fixing CI * Fixing types
* Update user soft and hard limits * Fix testt * Fix test
Automatic Merge
Currently translated at 100.0% (6074 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/
Currently translated at 100.0% (2604 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/de/
Currently translated at 96.6% (2516 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/ru/
Currently translated at 95.2% (5784 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/ru/
Currently translated at 94.8% (5762 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/uk/
Currently translated at 86.9% (2265 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/es/
Currently translated at 2.5% (66 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/nb_NO/
Currently translated at 63.3% (3848 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 100.0% (6074 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/
Currently translated at 63.4% (3853 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 63.7% (3870 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 63.7% (3872 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 100.0% (2604 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/cs/
Currently translated at 100.0% (6074 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/cs/
Currently translated at 100.0% (6074 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/cs/
Currently translated at 99.9% (2603 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/ja/
Currently translated at 100.0% (2604 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/uk/
Currently translated at 64.1% (3896 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 64.3% (3907 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 64.9% (3945 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 65.1% (3955 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 2.5% (66 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/nb_NO/
Currently translated at 66.2% (4024 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 66.7% (4054 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
Currently translated at 100.0% (2604 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/sv/
Currently translated at 99.8% (2599 of 2604 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/nl/
Currently translated at 66.7% (4056 of 6074 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
If the deadQueue was full, we would be incorrectly sending the wrong index for dqPtr. Fixed that and added a test case. https://mattermost.atlassian.net/browse/MM-63304 ```release-note NONE ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.1)
Can you help keep this open source service alive? 💖 Please sponsor : )