diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-10 10:41:16 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-10 10:41:16 +0100 |
| commit | cda0b7e1b142130fd2e4d7073e451a3f8d73b693 (patch) | |
| tree | 0d60230f7a4b3bbaab4d5d21e75a837fe1685801 /app/controllers/application_controller.rb | |
| parent | acd9bc0213098a5626499021eb72595eb556f9be (diff) | |
| download | gitlab-ce-cda0b7e1b142130fd2e4d7073e451a3f8d73b693.tar.gz | |
Rename ExpiringLock to ExclusiveLease
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 bc8019193ee..15fee9948ec 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -246,7 +246,7 @@ class ApplicationController < ActionController::Base def ldap_security_check if current_user && current_user.requires_ldap_check? - return unless Gitlab::LDAP::Access.try_lock_user(user) + return unless Gitlab::LDAP::Access.try_lock_user(current_user) unless Gitlab::LDAP::Access.allowed?(current_user) sign_out current_user |