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

..

exports

Remove exports/base controller in favor of shared concern (#3444)

2017-05-30 19:06:01 +02:00

two_factor_authentication

Redirect to 2FA creation page when otp_secret is not available (#6314)

2018-01-21 13:21:28 +01:00

applications_controller_spec.rb

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

deletes_controller_spec.rb

setting-for-account-deletable (#3852)

2017-06-19 15:12:31 +02:00

exports_controller_spec.rb

…

flavours_controller_spec.rb

Thank you, Officer Murphy

2018-01-10 12:10:43 -06:00

follower_domains_controller_spec.rb

Fix order of paginated accounts in FollowerDomainsController and spec (#3357)

2017-09-30 23:06:09 +02:00

imports_controller_spec.rb

Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)

2017-06-19 01:51:04 +02:00

keyword_mutes_controller_spec.rb

Set up /settings/keyword_mutes. #164.

2017-10-21 14:54:36 -05:00

notifications_controller_spec.rb

Separate notifications preferences from general preferences (#4447)

2017-10-04 10:22:52 +02:00

preferences_controller_spec.rb

Separate notifications preferences from general preferences (#4447)

2017-10-04 10:22:52 +02:00

profiles_controller_spec.rb

ActivityPub delivery (#4566)

2017-08-13 00:44:41 +02:00

two_factor_authentications_controller_spec.rb

Fix #3910 - Require OTP authentication to disable 2FA (#3935)

2017-06-25 23:51:46 +02:00