diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-08-31 11:21:40 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-09-01 10:51:40 +0100 |
| commit | 37383d9a9d9706008a7fa1d90079cb019681094b (patch) | |
| tree | bf6189c482ff51d783edf7b1778c7eed89590080 /app/controllers/application_controller.rb | |
| parent | d546f7d36e6703bda430e2f50fe4e87a07ab48f8 (diff) | |
| download | gitlab-ce-37383d9a9d9706008a7fa1d90079cb019681094b.tar.gz | |
Rollsback changes made to signing_enabled.
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 1d92ea11bda..97922e39ba8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -202,7 +202,7 @@ class ApplicationController < ActionController::Base end def check_password_expiration - if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && current_user.allow_password_authentication? + if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && !current_user.ldap_user? return redirect_to new_profile_password_path end end |