diff options
| author | Markus Koller <markus-koller@gmx.ch> | 2017-11-23 13:16:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-23 13:16:14 +0000 |
| commit | 257fd5713485a05460a9170190100643199a7e48 (patch) | |
| tree | afaaddcdc16ac407d72b7b4c0e96d951a141c268 /app/controllers/application_controller.rb | |
| parent | a6cafbcbe8d6802a81055c3469312f889cd73c9a (diff) | |
| download | gitlab-ce-257fd5713485a05460a9170190100643199a7e48.tar.gz | |
Allow password authentication to be disabled entirely
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b2ec491146f..ee21d81f23e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -196,7 +196,7 @@ class ApplicationController < ActionController::Base end def check_password_expiration - return if session[:impersonator_id] || current_user&.ldap_user? + return if session[:impersonator_id] || !current_user&.allow_password_authentication? password_expires_at = current_user&.password_expires_at |