diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-18 14:42:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-18 14:42:37 +0000 |
| commit | ce5abaae80764fc0c8505f115fb8bb5799bec7b1 (patch) | |
| tree | c01edf1aeadcd3cfa21b5200b0756d0ab13226be /config | |
| parent | 90aebe85884b95569ab65567155ce0ec15d65ef0 (diff) | |
| parent | 0013e6c00dc1743edb35b9b35a59c09fa0a0868e (diff) | |
| download | gitlab-ce-ce5abaae80764fc0c8505f115fb8bb5799bec7b1.tar.gz | |
Merge branch '37789-followup-for-read-registry-change' into 'master'
Clean up read_registry scope changes
Closes #37789
See merge request gitlab-org/gitlab-ce!14307
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 40e635bf2cf..b89f0419b91 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -58,7 +58,7 @@ Doorkeeper.configure do # For more information go to # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes default_scopes(*Gitlab::Auth::DEFAULT_SCOPES) - optional_scopes(*Gitlab::Auth::OPTIONAL_SCOPES) + optional_scopes(*Gitlab::Auth.optional_scopes) # Change the way client credentials are retrieved from the request object. # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then |