diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-25 03:12:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-25 03:12:22 +0000 |
| commit | 8b41647242282982279e88e0f863738e18b818ed (patch) | |
| tree | e5d5bef8d4c10d20f1cb425355fd6e7015061974 /config/initializers | |
| parent | 742d4b0878714b1d4ec098d00434cc940cd792aa (diff) | |
| download | gitlab-ce-8b41647242282982279e88e0f863738e18b818ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index d24c5431f53..918b2767c4d 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -121,17 +121,3 @@ Doorkeeper.configure do # We might want to disable this in the future, see https://gitlab.com/gitlab-org/gitlab/-/issues/323615 skip_client_authentication_for_password_grant true end - -module Doorkeeper - class AccessToken - # Doorkeeper OAuth Token refresh uses expires_in of refresh token for new token - # https://github.com/doorkeeper-gem/doorkeeper/pull/1366 - # This override ensures that tokens with expires_in: nil do not create new - # tokens with expires_in: nil during refresh flow. - # Can be removed after https://gitlab.com/gitlab-org/gitlab/-/issues/386094 is - # closed - def expires_in - super || 2.hours - end - end -end |