Merge branch 'fix-doorkeeper-failure' into 'master'

Fix the Doorkeeper.optional_scopes issue triggered by !13314 Closes #37753 See merge request !14219

Merge branch 'fix-doorkeeper-failure' into 'master'
3142b361 · Rémy Coutable · da4ca9f4 · 1e6d305b · 3142b361
Commit 3142b361 authored Sep 13, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

doorkeeper_spec.rb spec/initializers/doorkeeper_spec.rb +1 -1

No files found.
--- 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