Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.		2023-07-12 15:27:32 +02:00
..
activitypub	…
admin	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
api	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
auth	Add users index on unconfirmed_email (#25672)	2023-07-02 19:41:35 +02:00
concerns	Fixing an issue with a missing argument (#2261)	2023-07-01 22:55:43 +02:00
disputes	…
filters	…
oauth	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00
settings	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
well_known	…
about_controller.rb	…
accounts_controller.rb	…
application_controller.rb	…
authorize_interactions_controller.rb	…
backups_controller.rb	Add `allow_other_host: true` to backups controller (#25266)	2023-06-05 08:22:03 +02:00
custom_css_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
health_controller.rb	…
home_controller.rb	…
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
mail_subscriptions_controller.rb	Add unsubscribe link to e-mails (#25378)	2023-06-12 14:22:46 +02:00
manifests_controller.rb	…
media_controller.rb	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
media_proxy_controller.rb	…
privacy_controller.rb	…
relationships_controller.rb	…
shares_controller.rb	…
statuses_cleanup_controller.rb	…
statuses_controller.rb	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
tags_controller.rb	…