diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-16 09:59:10 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-16 11:12:21 +0200 |
| commit | e941365f3be88cebd57e9b08ba8702c1b688cb94 (patch) | |
| tree | 903b454248eb3ba230eabfb2c5427a11161e4c5c /app/controllers/jwt_controller.rb | |
| parent | ac6412d0766fbc090a3aa8272cfd4cc2d9a26c16 (diff) | |
| download | gitlab-ce-e941365f3be88cebd57e9b08ba8702c1b688cb94.tar.gz | |
Rename capabilities to authentication_abilities
Diffstat (limited to 'app/controllers/jwt_controller.rb')
| -rw-r--r-- | app/controllers/jwt_controller.rb | 2 |
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 |