Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		2022-02-17 10:58:44 +01:00
..
activitypub	Fix some flaky tests that randomly failed because of item ordering (#17509)	2022-02-10 22:00:10 +01:00
admin	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-11 21:53:20 +01:00
auth	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
concerns	Change public profile pages to be disabled for unconfirmed users (#17385)	2022-01-28 14:24:37 +01:00
disputes	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
well_known	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
authorize_interactions_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
following_accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
health_controller_spec.rb	Fix glitch-soc-specific health check spec	2021-04-05 15:21:38 +02:00
home_controller_spec.rb	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
instance_actors_controller_spec.rb	Fix instance actor not being dereferenceable (#17457)	2022-02-06 15:31:03 +01:00
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	Fix error when rendering public pages with media attachments (#16763)	2021-10-13 15:27:19 +02:00
media_proxy_controller_spec.rb	…
relationships_controller_spec.rb	Remove PubSubHubbub-related columns from accounts table (#16170)	2021-05-07 19:32:58 +02:00
remote_follow_controller_spec.rb	…
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_cleanup_controller_spec.rb	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
statuses_controller_spec.rb	…
tags_controller_spec.rb	…