diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-05 20:22:34 +0300 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-07 05:20:16 +0300 |
| commit | 8315861c9a50675b4f4f4ca536f0da90f27994f3 (patch) | |
| tree | b5f25e5dbd74621ef77d480ba69f4f21d5c00d7d /lib/gitlab/auth.rb | |
| parent | 72220a99d1cdbcf8a914f9e765c43e63eaee2548 (diff) | |
Include ProjectDeployTokens
Also:
- Changes scopes from serializer to use boolean columns
- Fixes broken specs
Diffstat (limited to 'lib/gitlab/auth.rb')
| -rw-r--r-- | lib/gitlab/auth.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 336cdbab5f0..d03b1caca91 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -184,9 +184,9 @@ module Gitlab return unless token return unless login != "gitlab+deploy-token-#{token.id}" - + scopes = abilities_for_scopes(token.scopes) - if valid_scoped_token?(token, scopes) + if valid_scoped_token?(token, available_scopes) Gitlab::Auth::Result.new(token, token.project, :deploy_token, scopes) end end |