about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-02-04 15:05:53 +0100
committerGitHub <noreply@github.com>2018-02-04 15:05:53 +0100
commit38e0133e1b01c21a710111097102a6eb205b9b9b (patch)
tree75a920630ddb7e0b745856c8d2f5edd558eb19a7 /app
parent9b6223f5e26ed53f285a95921e9c660e831a7f6d (diff)
Make PAM gem optional, allow configuration over environment (#6415)
Diffstat (limited to 'app')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index fba478453..feaf8b26c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -52,7 +52,7 @@ class User < ApplicationRecord
   devise :registerable, :recoverable, :rememberable, :trackable, :validatable,
          :confirmable
 
-  devise :pam_authenticatable
+  devise :pam_authenticatable if Devise.pam_authentication
   devise :omniauthable
 
   belongs_to :account, inverse_of: :user