diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-03 15:20:11 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-03 15:20:11 +0200 |
| commit | 9d491712cfe33286329524fb39dc5bf8e4c8affd (patch) | |
| tree | 0e99ae15e613d5971ba9e7c7ffcdd51e37a2f725 /app/controllers/jwt_controller.rb | |
| parent | fab695461afbc4d03fbbf8cfbf9c5d90760ce752 (diff) | |
| parent | ca3c5c295ed653b483fe81c3918ffe60f46666b9 (diff) | |
| download | gitlab-ce-awardables.tar.gz | |
Merge branch 'master' into awardablesawardables
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 156ab2811d6..cee3b6c43e7 100644 --- a/app/controllers/jwt_controller.rb +++ b/app/controllers/jwt_controller.rb @@ -32,7 +32,7 @@ class JwtController < ApplicationController end def auth_params - params.permit(:service, :scope, :offline_token, :account, :client_id) + params.permit(:service, :scope, :account, :client_id) end def authenticate_project(login, password) |