diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
commit | b39512ed755239198a9c294b6a45e65c05900235 (patch) | |
tree | d234a3efade1de67c46b9e5a38ce813627726aa7 /app/controllers/oauth | |
parent | d31474cf3b17ece37939d20082b07f6657cc79a9 (diff) |
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
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 |