kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge conditions. Not worth an additional pointless method: 

Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12321267
This commit is contained in:
Lin Jen-Shin 2016-06-08 15:43:43 +08:00
parent d7b08024af
commit 8b34687a36
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/ci/runner.rb
View File

@ -99,9 +99,7 @@ module Ci
end
def can_pick?(build)
available_for?(build.project) &&
run_untagged_or_has_tags?(build) &&
accepting_tags?(build.tag_list)
available_for?(build.project) && accepting_tags?(build)
end
def only_for?(project)
@ -129,12 +127,8 @@ module Ci
!locked? || projects.exists?(id: project.id)
end
def run_untagged_or_has_tags?(build)
run_untagged? || build.has_tags?
end
def accepting_tags?(target_tags)
(target_tags - tag_list).empty?
def accepting_tags?(build)
(run_untagged? || build.has_tags?) && (build.tag_list - tag_list).empty?
end
end
end