nachtjasmin 4033d28160 Merge tag 'v4.2.0-rc1' into lets-bump-hometown-to-mastodon-4.2 ... Conflict resolution: - app/javascript/mastodon/features/compose/components/search_results.jsx: taken as is - app/models/account.rb: use upstream SQL queries for filtering - app/models/media_attachment.rb: use upstream ffmpeg settings - config/locales/de.yml: merged		2023-11-18 16:55:55 +01:00
..
v1	Merge tag 'v4.2.0-rc1' into lets-bump-hometown-to-mastodon-4.2	2023-11-18 16:55:55 +01:00
v2	Merge upstream security fixes of v4.0.5 (#1316)	2023-07-06 12:30:13 -07:00
web	Fix embed dropdown menu item for unauthenticated users (#25964)	2023-07-13 15:53:03 +02:00
base_controller.rb	Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)	2023-08-02 19:32:48 +02:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00