Skip to content
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

Merge master branch into production #461

Merged
merged 73 commits into from
Sep 18, 2024
Merged

Merge master branch into production #461

merged 73 commits into from
Sep 18, 2024

Conversation

streamer45
Copy link
Contributor

Summary

Merging master branch back into production. This hasn't been done in a long time I feel, but now we need to port recent changes (e.g., #457, #458) before I can finally update plugins.json with Calls v1+ and get a working deployment.

hanzei and others added 30 commits November 25, 2020 12:02
* Add experimental and partner label

* Update generator add

* Apply labels before sending a response
Co-authored-by: Ben Schumacher <[email protected]>
Co-authored-by: Jesse Hallam <[email protected]>
Co-authored-by: Christopher Speller <[email protected]>
Co-authored-by: Daniel Espino García <[email protected]>
Co-authored-by: Alejandro García Montoro <[email protected]>
Co-authored-by: Christopher Poile <[email protected]>
Co-authored-by: Michael Kochell <[email protected]>
* update mattermost-server version

* remove ioutil

* remove deprecated linters, add revive

* experimenting with go and node circleci upgrades

* fix

* fix

* go 1.19, revive, fix new linter errors

* fix golangci-lint-version to match dep orb

* fix comment

* use same golangci-lint as plugins

* fix failing build?

* testing...

* remove unneeded gotest/tools

* fix
@streamer45 streamer45 added the 2: Dev Review Requires review by a core committer label Sep 17, 2024
@streamer45 streamer45 self-assigned this Sep 17, 2024
@streamer45 streamer45 added 4: Reviews Complete All reviewers have approved the pull request Do Not Merge Should not be merged until this label is removed and removed 2: Dev Review Requires review by a core committer labels Sep 18, 2024
@streamer45
Copy link
Contributor Author

Tested a local deployment, and it looks good. Merging.

@streamer45 streamer45 removed the Do Not Merge Should not be merged until this label is removed label Sep 18, 2024
@streamer45 streamer45 merged commit c2eb303 into production Sep 18, 2024
4 checks passed
@streamer45 streamer45 deleted the merge-master branch September 18, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4: Reviews Complete All reviewers have approved the pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.