summaryrefslogtreecommitdiff
path: root/app/models/ci
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-08-28 21:10:01 +0900
committerShinya Maeda <shinya@gitlab.com>2017-09-03 23:49:10 +0900
commit4b0e31ba64118011ffc29c31bc771fa2568cd270 (patch)
tree21f4a5273bf28c514ede0a698b2c2459a3710a75 /app/models/ci
parent6fbb3ce6e93b8dfba795d4542fcb5602c4c82eaf (diff)
downloadgitlab-ce-4b0e31ba64118011ffc29c31bc771fa2568cd270.tar.gz
Extend can_pick?
Diffstat (limited to 'app/models/ci')
-rw-r--r--app/models/ci/runner.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 24b62555845..a3b4a1fccf3 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -111,6 +111,8 @@ module Ci
end
def can_pick?(build)
+ return false if self.protected_? && !build.protected?
+
assignable_for?(build.project) && accepting_tags?(build)
end