Merge security fixes of mastodon v4.0.13 #1340
Merged
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
…ete protocol values (mastodon#25886)
…red (mastodon#25850) Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
…6741) Co-authored-by: Renaud Chaput <renchap@gmail.com>
…ess when public preview is disabled (mastodon#26237)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
…le to passthrough (mastodon#26608) Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Fix insufficient origin validation * Bump version to v4.0.13
nachtjasmin
changed the base branch from
hometown-dev
to
hometown-4.0.10-merge
nachtjasmin
force-pushed
the
merge-security-fixes-of-mastodon-v4.0.13
branch
from
7109ced to
6232fcb
Compare
|
Thank you!!!! |
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.
There were some smaller merge conflicts (e.g. in
lib/version.rb), but all of them were of smaller nature. Due to the fact that other v4.0.* versions are also included, it's a bit bigger than the other PR for 3.5.I won't repeat the changelog here, the upgrade is the usual git pull and restart all mastodon processes.