about summary refs log tree commit diff
path: root/config/application.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-09-24 04:35:36 +0200
committerGitHub <noreply@github.com>2019-09-24 04:35:36 +0200
commita1f04c1e3497e9dff5970038461d9f454f2650df (patch)
tree926ec210c5f8f794b9991c6aee80571c29e2bb2e /config/application.rb
parent67bef15e53a77b6f1557fdd0efa65f3e916c20df (diff)
Fix authentication before 2FA challenge (#11943)
Regression from #11831
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb
index 5fd37120d..3ced81b8f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,7 +13,8 @@ require_relative '../lib/paperclip/video_transcoder'
 require_relative '../lib/paperclip/type_corrector'
 require_relative '../lib/mastodon/snowflake'
 require_relative '../lib/mastodon/version'
-require_relative '../lib/devise/ldap_authenticatable'
+require_relative '../lib/devise/two_factor_ldap_authenticatable'
+require_relative '../lib/devise/two_factor_pam_authenticatable'
 
 Dotenv::Railtie.load