Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		2019-07-23 10:51:07 +02:00
..
activitypub	Add ActivityPub secure mode (#11269)	2019-07-11 20:11:09 +02:00
admin	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
auth	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
concerns	Change locale detection to run once per session (#8657)	2019-07-21 18:08:02 +02:00
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
well_known	…
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-07-23 10:51:07 +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	…
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	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
tags_controller_spec.rb	…