tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
This commit is contained in:
Thibaut Girka
2019-09-18 17:25:56 +02:00
parent ab646fac5f d0c2c52783
commit 5cadb47238
180 changed files with 1537 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/initializers/devise.rb
View File

@@ -71,10 +71,13 @@ end
Devise.setup do |config|
config.warden do |manager|
manager.default_strategies(scope: :user).unshift :database_authenticatable
manager.default_strategies(scope: :user).unshift :ldap_authenticatable if Devise.ldap_authentication
manager.default_strategies(scope: :user).unshift :pam_authenticatable if Devise.pam_authentication
manager.default_strategies(scope: :user).unshift :two_factor_authenticatable
manager.default_strategies(scope: :user).unshift :two_factor_backupable
# We handle 2FA in our own sessions controller so this gets in the way
manager.default_strategies(scope: :user).delete :two_factor_backupable
manager.default_strategies(scope: :user).delete :two_factor_authenticatable
end
# The secret key used by Devise. Devise uses this key to generate