You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master		7 years ago
..
exports	Remove exports/base controller in favor of shared concern (#3444)	8 years ago
two_factor_authentication	Cover Settings::TwoFactorAuthentication::RecoveryCodesController more (#3383)	8 years ago
applications_controller_spec.rb	Remove empty strings (#5732)	7 years ago
deletes_controller_spec.rb	setting-for-account-deletable (#3852)	8 years ago
exports_controller_spec.rb	Cover Settings::ExportsController more (#3358)	8 years ago
follower_domains_controller_spec.rb	Fix order of paginated accounts in FollowerDomainsController and spec (#3357)	7 years ago
imports_controller_spec.rb	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)	8 years ago
keyword_mutes_controller_spec.rb	Set up /settings/keyword_mutes. #164.	7 years ago
notifications_controller_spec.rb	Separate notifications preferences from general preferences (#4447)	7 years ago
preferences_controller_spec.rb	Separate notifications preferences from general preferences (#4447)	7 years ago
profiles_controller_spec.rb	ActivityPub delivery (#4566)	7 years ago
two_factor_authentications_controller_spec.rb	Fix #3910 - Require OTP authentication to disable 2FA (#3935)	8 years ago