hometown

History

Jasmin 3b69a29703 Merge changes of 4.0.7..4.0.10 (#1324 ) 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: ⚠️ Restart of all Mastodon processes, especially the Streaming API There was a conflict during the merge inside the `streaming/index.js`, which was related to the following snippet: ```js // Only send local-only statuses to logged-in users if (payload.local_only && !req.accountId) { log.silly(req.requestId, `Message ${payload.id} filtered because it was local-only`); return; } ``` 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. --------- Co-authored-by: Michael Stanclift <mx@vmstan.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com> Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com> Co-authored-by: yufushiro <62991447+yufushiro@users.noreply.github.com> Co-authored-by: Nicolai Søborg <NicolaiSoeborg@users.noreply.github.com>		3 years ago
..
v1	Merge changes of 4.0.7..4.0.10 (#1324 )	3 years ago
v2	Merge upstream security fixes of v4.0.5 (#1316 )	3 years ago
web	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040 )	5 years ago
base_controller_spec.rb	Refactor and improve tests (#17386 )	4 years ago
oembed_controller_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247 )	7 years ago