diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
| commit | c993481d991333fe0750080eec98fd2e9eeda8d5 (patch) | |
| tree | 7d1fdd7926f8542b7fbf7add052004dbfd48b206 /app/models/ci/project.rb | |
| parent | 83f04853e9a749c3397ee7683a78b986e1070904 (diff) | |
| parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
| download | gitlab-ce-git-archive-golang.tar.gz | |
Merge branch 'master' into git-archive-golanggit-archive-golang
Diffstat (limited to 'app/models/ci/project.rb')
| -rw-r--r-- | app/models/ci/project.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/project.rb b/app/models/ci/project.rb index 88ba933a434..ef28353a30c 100644 --- a/app/models/ci/project.rb +++ b/app/models/ci/project.rb @@ -115,12 +115,12 @@ module Ci web_url end - def any_runners? - if runners.active.any? + def any_runners?(&block) + if runners.active.any?(&block) return true end - shared_runners_enabled && Ci::Runner.shared.active.any? + shared_runners_enabled && Ci::Runner.shared.active.any?(&block) end def set_default_values |