diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-13 09:06:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-13 09:06:19 +0000 |
| commit | 3142b361499c3f858c3d78bfe7c82d9faac1e097 (patch) | |
| tree | 4bd63c32dc3cc2592e97c4b542f61d20db653c66 | |
| parent | da4ca9f44caaa3876d2b6d2021366d2d0e035241 (diff) | |
| parent | 1e6d305bcc922d3c277997099cab789b5743315a (diff) | |
| download | gitlab-ce-3142b361499c3f858c3d78bfe7c82d9faac1e097.tar.gz | |
Merge branch 'fix-doorkeeper-failure' into 'master'
Fix the Doorkeeper.optional_scopes issue triggered by !13314
Closes #37753
See merge request !14219
| -rw-r--r-- | spec/initializers/doorkeeper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/initializers/doorkeeper_spec.rb b/spec/initializers/doorkeeper_spec.rb index 74bdbb01166..37cc08b3038 100644 --- a/spec/initializers/doorkeeper_spec.rb +++ b/spec/initializers/doorkeeper_spec.rb @@ -10,7 +10,7 @@ describe Doorkeeper.configuration do describe '#optional_scopes' do it 'matches Gitlab::Auth::OPTIONAL_SCOPES' do - expect(subject.optional_scopes).to eq Gitlab::Auth::OPTIONAL_SCOPES + expect(subject.optional_scopes).to eq Gitlab::Auth::OPTIONAL_SCOPES - Gitlab::Auth::REGISTRY_SCOPES end end |