diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-04 10:39:28 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-04 10:39:28 +0000 |
| commit | 48bbb36347c1c5d4d7922e1998c47d235eb71208 (patch) | |
| tree | d24a0587b1fed960aa5c8060d32aab1b8028b124 /app/models/project.rb | |
| parent | d026441b3c68e682a136d09d68b18fa0a73684fe (diff) | |
| parent | d3bcb06dc6365129b62dadf49efc58daecd39a83 (diff) | |
| download | gitlab-ce-48bbb36347c1c5d4d7922e1998c47d235eb71208.tar.gz | |
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/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index d91d7dcfe9a..7304ab7b909 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1422,7 +1422,7 @@ class Project < ActiveRecord::Base end def shared_runners - @shared_runners ||= shared_runners_available? ? Ci::Runner.shared : Ci::Runner.none + @shared_runners ||= shared_runners_available? ? Ci::Runner.instance_type : Ci::Runner.none end def group_runners |