Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		2022-04-06 21:10:23 +02:00
..
activitypub	Spelling (#17705)	2022-03-06 22:51:40 +01:00
admin	Fix test-related issues (#17888)	2022-03-28 12:43:58 +02:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-30 13:40:10 +02:00
auth	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +02:00
concerns	…
disputes	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-28 16:22:28 +02:00
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Spelling (#17705)	2022-03-06 22:51:40 +01:00
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	2022-03-07 09:36:47 +01:00
following_accounts_controller_spec.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	2022-03-07 09:36:47 +01:00
health_controller_spec.rb	…
home_controller_spec.rb	…
instance_actors_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
media_proxy_controller_spec.rb	…
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	…
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_cleanup_controller_spec.rb	…
statuses_controller_spec.rb	Spelling (#17705)	2022-03-06 22:51:40 +01:00
tags_controller_spec.rb	…