summaryrefslogtreecommitdiff
path: root/app/controllers/projects/git_http_client_controller.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-09-20 15:41:41 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-20 15:41:41 +0200
commit0672c5a92e8be90da0cb79f277bb7aee82fdba8a (patch)
tree5a22d9175f8e0af89a214a6b257b6389daf9b18a /app/controllers/projects/git_http_client_controller.rb
parentf30005f0a99b6ab019af22a8b7db40aecd1ff066 (diff)
downloadgitlab-ce-0672c5a92e8be90da0cb79f277bb7aee82fdba8a.tar.gz
Post-merge improve of CI permissions
Diffstat (limited to 'app/controllers/projects/git_http_client_controller.rb')
-rw-r--r--app/controllers/projects/git_http_client_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb
index cbfd3cab3dd..383e184d796 100644
--- a/app/controllers/projects/git_http_client_controller.rb
+++ b/app/controllers/projects/git_http_client_controller.rb
@@ -32,11 +32,11 @@ class Projects::GitHttpClientController < Projects::ApplicationController
return # Allow access
end
elsif allow_kerberos_spnego_auth? && spnego_provided?
- user = find_kerberos_user
+ kerberos_user = find_kerberos_user
- if user
+ if kerberos_user
@authentication_result = Gitlab::Auth::Result.new(
- user, nil, :kerberos, Gitlab::Auth.full_authentication_abilities)
+ kerberos_user, nil, :kerberos, Gitlab::Auth.full_authentication_abilities)
send_final_spnego_response
return # Allow access