diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-12 09:57:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-12 09:57:48 +0000 |
| commit | 2602cc0c36966ba366db8393786e9164e95a188c (patch) | |
| tree | 0ae6757c823f78ecde416fb8182f6662fb27f018 /lib | |
| parent | 5d3f7b133fba9bba876da5ef13c630320a920e3f (diff) | |
| parent | 62ef67acc3a8d260aa3e641b350aaecf8d60f1aa (diff) | |
| download | gitlab-ce-2602cc0c36966ba366db8393786e9164e95a188c.tar.gz | |
Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master'
Hide read_registry scope when registry is disabled on instance
See merge request !13314
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/auth.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 3fd81759d25..11ace83c15c 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -2,7 +2,7 @@ module Gitlab module Auth MissingPersonalTokenError = Class.new(StandardError) - REGISTRY_SCOPES = [:read_registry].freeze + REGISTRY_SCOPES = Gitlab.config.registry.enabled ? [:read_registry].freeze : [].freeze # Scopes used for GitLab API access API_SCOPES = [:api, :read_user].freeze |