diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 23:43:10 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 23:43:10 +0900 |
| commit | b4d167a8f78509e241639e560ee1fed545d2dbc1 (patch) | |
| tree | ad31164a4fe19d7c3dbc7d9e9f1d3ee6e3e65637 /app/controllers/admin/impersonation_tokens_controller.rb | |
| parent | c5377b97968ba9edefe7766dac77cc9fbbaa4e2c (diff) | |
| parent | d4ceec9d47a7da5fa17cb6e161ac491e13fcb8bd (diff) | |
| download | gitlab-ce-b4d167a8f78509e241639e560ee1fed545d2dbc1.tar.gz | |
Merge branch 'master' into feature/sm/3691-expose-per-project-pipeline-idfeature/sm/3691-expose-per-project-pipeline-id
Diffstat (limited to 'app/controllers/admin/impersonation_tokens_controller.rb')
| -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 07c8bf714fc..7a2c7234a1e 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::API_SCOPES + @scopes = Gitlab::Auth.available_scopes(current_user) @impersonation_token ||= finder.build @inactive_impersonation_tokens = finder(state: 'inactive').execute |