diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-04 00:08:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-04 00:08:55 +0000 |
| commit | ff71e5f91c447686ab7bec7407dba0d4738a8807 (patch) | |
| tree | de5ab12000d8b49cc7054d57db008280151851c6 /app/controllers/oauth | |
| parent | e643b1a37690e16a3683aea0a3369e9723e17a35 (diff) | |
| download | gitlab-ce-ff71e5f91c447686ab7bec7407dba0d4738a8807.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/oauth')
| -rw-r--r-- | app/controllers/oauth/token_info_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/oauth/token_info_controller.rb b/app/controllers/oauth/token_info_controller.rb index 789356f4410..626184150bd 100644 --- a/app/controllers/oauth/token_info_controller.rb +++ b/app/controllers/oauth/token_info_controller.rb @@ -9,7 +9,7 @@ class Oauth::TokenInfoController < Doorkeeper::TokenInfoController # maintain backwards compatibility render json: token_json.merge( - 'scopes' => token_json[:scope], + 'scopes' => token_json[:scope], 'expires_in_seconds' => token_json[:expires_in] ), status: :ok else |