diff options
| author | Simon Knox <psimyn@gmail.com> | 2018-05-09 07:40:26 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2018-05-09 07:40:26 +1000 |
| commit | df2813dfbe19dda506ec3fd6da11086c1440b381 (patch) | |
| tree | 01fab5d3e6a84cf985288ac4c8996d082b7ae9ef /app/controllers/projects/settings/ci_cd_controller.rb | |
| parent | 2608888617f450f025158a375b887d446f92cfc0 (diff) | |
| parent | bd0745f1a64a2cd8050be785c5195ecce775616d (diff) | |
| download | gitlab-ce-df2813dfbe19dda506ec3fd6da11086c1440b381.tar.gz | |
Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring
Diffstat (limited to 'app/controllers/projects/settings/ci_cd_controller.rb')
| -rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index d80ef8113aa..177c8a54099 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -67,10 +67,18 @@ module Projects def define_runners_variables @project_runners = @project.runners.ordered - @assignable_runners = current_user.ci_authorized_runners - .assignable_for(project).ordered.page(params[:page]).per(20) + + @assignable_runners = current_user + .ci_authorized_runners + .assignable_for(project) + .ordered + .page(params[:page]).per(20) + @shared_runners = ::Ci::Runner.shared.active + @shared_runners_count = @shared_runners.count(:all) + + @group_runners = ::Ci::Runner.belonging_to_parent_group_of_project(@project.id) end def define_secret_variables |