about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorAlexander <devkral@web.de>2018-03-19 20:08:56 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-03-19 20:08:56 +0100
commit0306e3e9bebe0b0d9ad7e5fe328dd3677717b7e5 (patch)
treec766026ff276936a39c1149f7c2c8ac3c12ea1d8 /config
parent357f9298bdb595f67b1f89292be9fa4268e1bffd (diff)
bugfixes and gem update (#6831)
* update to new version of devise_pam_authenticatable2

* fix behaviour if suffix is nil, fix environment loading, fix user email creation

* code cleanup/fix linter warning
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 097cbf567..326a0ec8c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,6 +16,8 @@ require_relative '../lib/devise/ldap_authenticatable'
 
 Dotenv::Railtie.load
 
+Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true'
+
 require_relative '../lib/mastodon/redis_config'
 
 module Mastodon