diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
| commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
| tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /app/controllers/oauth | |
| parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.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 e37f8992d92..789356f4410 100644 --- a/app/controllers/oauth/token_info_controller.rb +++ b/app/controllers/oauth/token_info_controller.rb @@ -13,7 +13,7 @@ class Oauth::TokenInfoController < Doorkeeper::TokenInfoController 'expires_in_seconds' => token_json[:expires_in] ), status: :ok else - error = Doorkeeper::OAuth::ErrorResponse.new(name: :invalid_request) + error = Doorkeeper::OAuth::InvalidTokenResponse.new response.headers.merge!(error.headers) render json: error.body, status: error.status end |