diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-04 13:39:28 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-04 13:39:28 +0300 |
| commit | 48bbb36347c1c5d4d7922e1998c47d235eb71208 (patch) | |
| tree | d24a0587b1fed960aa5c8060d32aab1b8028b124 /app/controllers/projects | |
| parent | d026441b3c68e682a136d09d68b18fa0a73684fe (diff) | |
| parent | d3bcb06dc6365129b62dadf49efc58daecd39a83 (diff) | |
Merge branch 'remove-is-shared-from-ci-runners' into 'master'
Remove the use of `is_shared` of `Ci::Runner`
See merge request gitlab-org/gitlab-ce!20172
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index fb3f6eec2bd..322ec096ffb 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -74,7 +74,7 @@ module Projects .ordered .page(params[:page]).per(20) - @shared_runners = ::Ci::Runner.shared.active + @shared_runners = ::Ci::Runner.instance_type.active @shared_runners_count = @shared_runners.count(:all) |