Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
activitypub	Add ActivityPub secure mode (#11269)	2019-07-11 20:11:09 +02:00
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
api	Fix tests being broken because of different default setting	2019-09-13 20:28:22 +02:00
auth	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
concerns	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
oauth
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
well_known	Add a nodeinfo endpoint (#12002)	2019-09-29 21:31:51 +02:00
about_controller_spec.rb
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-13 18:13:43 +02:00
authorize_interactions_controller_spec.rb
emojis_controller_spec.rb
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
home_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	2019-08-16 19:15:05 +02:00
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	Fix uncaught domain normalization error in remote follow (#11703)	2019-08-30 02:19:17 +02:00
remote_interaction_controller_spec.rb
shares_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	2019-08-16 19:15:05 +02:00
statuses_controller_spec.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
tags_controller_spec.rb