forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 57
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 changes of 4.0.7..4.0.10 #1324
Merged
dariusk
merged 33 commits into
hometown-fork:hometown-4.0.6-merge
from
queer-group:upstream-changes-from-4-0-x
Sep 20, 2023
Merged
Merge changes of 4.0.7..4.0.10 #1324
dariusk
merged 33 commits into
hometown-fork:hometown-4.0.6-merge
from
queer-group:upstream-changes-from-4-0-x
Sep 20, 2023
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>
nachtjasmin
changed the title
Merge changes of 4.0.7 and 4.0.8
Merge changes of 4.0.7..4.0.10
Sep 19, 2023
Thank you for all your work! Merging this to the branch, then will test locally, then do the release if all goes well. |
Thank you for your work on this update! |
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.
This includes all changes made in https://github.com/mastodon/mastodon/releases/tag/v4.0.7 and https://github.com/mastodon/mastodon/releases/tag/v4.0.8 and therefore requires:
There was a conflict during the merge inside the
streaming/index.js
, which was related to the following snippet:I've placed it at the same spot where it was previously, so everything should work as before.
However, I still need to test those changes, which is what I'll be doing after submitting this PR as draft.Checked the changes against our instance, everything is working as expected as logged-in user. Haven't checked the public timelines where the above snippet would be relevant, as we are using
AUTHORIZED_FETCH
and I would like to keep it enabled. ^^If the base branch is not correct, feel free to change it.
Everything is already deployed on queer.group and working fine there.