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 /app | |
| 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 'app')
| -rw-r--r-- | app/models/personal_access_token.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb index 654be927ed8..ec0ebe4d353 100644 --- a/app/models/personal_access_token.rb +++ b/app/models/personal_access_token.rb @@ -28,7 +28,7 @@ class PersonalAccessToken < ActiveRecord::Base protected def validate_scopes - unless scopes.all? { |scope| Gitlab::Auth::AVAILABLE_SCOPES.include?(scope.to_sym) } + unless revoked || scopes.all? { |scope| Gitlab::Auth::AVAILABLE_SCOPES.include?(scope.to_sym) } errors.add :scopes, "can only contain available scopes" end end |