summaryrefslogtreecommitdiff
path: root/app/models/ci/runner.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-06-08 15:19:49 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-06-09 16:00:24 +0800
commit268f7713a9c076204a8b6badb847d2e23bafdd71 (patch)
treed9dc67b880847b81a8717a48d51646cc147ddd23 /app/models/ci/runner.rb
parentde04004803b76cb9945ef027d04968cef7b41b2b (diff)
downloadgitlab-ce-268f7713a9c076204a8b6badb847d2e23bafdd71.tar.gz
Remove Build#can_be_served? and rename Runner#can_serve? to can_pick?
This also moves tests from build_spec.rb to runner_spec.rb
Diffstat (limited to 'app/models/ci/runner.rb')
-rw-r--r--app/models/ci/runner.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index bb5340a0f03..44f820d100b 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -98,7 +98,7 @@ module Ci
!shared?
end
- def can_serve?(build)
+ def can_pick?(build)
not_locked_or_locked_to?(build.project) &&
run_untagged_or_has_tags?(build) &&
accepting_tags?(build.tag_list)