Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-09-15 14:49:11 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-15 14:49:11 +0300
commit9d1ccd2ad3af37139649100476b568d219343a57 (patch)
tree4475c8f777e25a3a7708ed7012f190b844fdaa7c /app/controllers/jwt_controller.rb
parent50076ab974348e74514bb4f19169351f08e11636 (diff)
Fix existing authorization specs
Diffstat (limited to 'app/controllers/jwt_controller.rb')
-rw-r--r--app/controllers/jwt_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index ed5d28e0d2c..0870a2a8f50 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -11,10 +11,10 @@ class JwtController < ApplicationController
service = SERVICES[params[:service]]
return head :not_found unless service
- @@authentication_result ||= Gitlab::Auth.Result.new
+ @authentication_result ||= Gitlab::Auth::Result.new
result = service.new(@authentication_result.project, @authentication_result.user, auth_params).
- execute(capabilities: @authentication_result.capabilities || [])
+ execute(capabilities: @authentication_result.capabilities)
render json: result, status: result[:http_status]
end
@@ -23,7 +23,7 @@ class JwtController < ApplicationController
def authenticate_project_or_user
authenticate_with_http_basic do |login, password|
- @authentication_result = Gitlab::Auth.find_for_git_client(login, password, ip: request.ip)
+ @authentication_result = Gitlab::Auth.find_for_git_client(login, password, project: nil, ip: request.ip)
render_403 unless @authentication_result.succeeded?
end