David Yip 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		2018-01-21 13:36:10 -06:00
..
activitypub	Revert #5772 (#6221)	2018-01-08 10:57:52 +01:00
admin
api	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
auth	Fix email confirmation link not updating email (#6187)	2018-01-05 00:15:35 +01:00
concerns	Fix regeneration marker not expiring (#6290)	2018-01-18 20:29:56 +01:00
oauth
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-21 13:36:10 -06:00
well_known
about_controller_spec.rb
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb
application_controller_spec.rb	Fix force_ssl conditional (#6201)	2018-01-07 15:19:23 +01:00
authorize_follows_controller_spec.rb
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
home_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb
remote_follow_controller_spec.rb
statuses_controller_spec.rb
stream_entries_controller_spec.rb
tags_controller_spec.rb