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-16 10:59:10 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-16 12:12:21 +0300
commite941365f3be88cebd57e9b08ba8702c1b688cb94 (patch)
tree903b454248eb3ba230eabfb2c5427a11161e4c5c /app/controllers/jwt_controller.rb
parentac6412d0766fbc090a3aa8272cfd4cc2d9a26c16 (diff)
Rename capabilities to authentication_abilities
Diffstat (limited to 'app/controllers/jwt_controller.rb')
-rw-r--r--app/controllers/jwt_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index a69534c2258..06d96774754 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -14,7 +14,7 @@ class JwtController < ApplicationController
@authentication_result ||= Gitlab::Auth::Result.new
result = service.new(@authentication_result.project, @authentication_result.actor, auth_params).
- execute(capabilities: @authentication_result.capabilities)
+ execute(authentication_abilities: @authentication_result.authentication_abilities)
render json: result, status: result[:http_status]
end