diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-03 00:10:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-03 00:10:43 +0300 |
| commit | a961982252b5e33af6d7de358fbae28cb8cfd104 (patch) | |
| tree | c8cb5fa18814881e76fa2c757855ba832f9e49f3 /config | |
| parent | 4e06ca9e7d67aee59d691a363dabba46d53d34ba (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 2f98471772f..6b54b5074d5 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -3,6 +3,10 @@ Doorkeeper.configure do # Currently supported options are :active_record, :mongoid2, :mongoid3, :mongo_mapper orm :active_record + # Restore to pre-5.1 generator due to breaking change. + # See https://gitlab.com/gitlab-org/gitlab/-/issues/244371 + default_generator_method :hex + # This block will be called to check whether the resource owner is authenticated or not. resource_owner_authenticator do # Put your resource owner authentication logic here. |