Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.		2023-03-22 19:50:11 +01:00
..
activitypub	…
admin	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-22 19:50:11 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-22 19:50:11 +01:00
disputes	…
filters	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
oauth	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 21:56:05 +01:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
well_known	…
about_controller.rb	…
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-18 11:21:03 +01:00
authorize_interactions_controller.rb	…
backups_controller.rb	Change user backups to use expiring URLs for download when possible (#24136)	2023-03-16 22:46:52 +01:00
custom_css_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
following_accounts_controller.rb	Fix single name variables on controller folder (#20092)	2022-12-15 17:11:58 +01:00
health_controller.rb	…
home_controller.rb	…
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
media_proxy_controller.rb	…
privacy_controller.rb	…
relationships_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
shares_controller.rb	…
statuses_cleanup_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
tags_controller.rb	Autofix Rubocop Style/TrailingCommaInArguments (#23694)	2023-02-18 12:39:58 +01:00