diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-07 19:59:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-07 19:59:23 +0000 |
| commit | 668844f5bd9e0431360fcc758bec753148c33729 (patch) | |
| tree | dd357fd9b4691908beb801c602d954deacaca08c /app | |
| parent | 57e709757f601878d2a688d092de1b1c97bdff7a (diff) | |
| parent | 8549f7aa1e4d0bf58e79a572665b6fa35b83e9d0 (diff) | |
| download | gitlab-ce-668844f5bd9e0431360fcc758bec753148c33729.tar.gz | |
Merge branch 'fix-specs-for-access-tokens' into 'master'
Fix access token specs
See merge request !9776
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/impersonation_tokens_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/impersonation_tokens_controller.rb b/app/controllers/admin/impersonation_tokens_controller.rb index d26004539b5..07c8bf714fc 100644 --- a/app/controllers/admin/impersonation_tokens_controller.rb +++ b/app/controllers/admin/impersonation_tokens_controller.rb @@ -44,7 +44,7 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController end def set_index_vars - @scopes = Gitlab::Auth::SCOPES + @scopes = Gitlab::Auth::API_SCOPES @impersonation_token ||= finder.build @inactive_impersonation_tokens = finder(state: 'inactive').execute |