Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		2020-03-22 16:10:44 +01:00
..
activitypub
admin	Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)	2020-03-21 03:08:09 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
auth	Fix sign-ups without checked user agreement being accepted through the web form (#13088)	2020-02-16 12:56:53 +01:00
concerns	Change signature verification to ignore signatures with invalid host (#13033)	2020-02-03 17:48:23 +01:00
oauth
settings	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
well_known
about_controller_spec.rb
account_follow_controller_spec.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
account_unfollow_controller_spec.rb
accounts_controller_spec.rb
application_controller_spec.rb
authorize_interactions_controller_spec.rb
emojis_controller_spec.rb
follower_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
following_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
health_check_controller_spec.rb	Add test for health_check endpoint	2020-02-10 20:04:41 +01:00
home_controller_spec.rb
intents_controller_spec.rb
invites_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb
relationships_controller_spec.rb
remote_follow_controller_spec.rb
remote_interaction_controller_spec.rb
shares_controller_spec.rb
statuses_controller_spec.rb
tags_controller_spec.rb