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

Merge branch 'remove-ci_job_request_with_tags_matcher' into 'master' 

Remove the ci_job_request_with_tags_matcher

See merge request gitlab-org/gitlab-ce!19947
This commit is contained in:
Stan Hu 2018-06-17 18:10:43 +00:00
parent 1e22513afd 55c453858d
commit 937c1b5be9
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/services/ci/register_job_service.rb
View File

@ -25,14 +25,12 @@ module Ci
valid = true
if Feature.enabled?('ci_job_request_with_tags_matcher')
# pick builds that does not have other tags than runner's one
builds = builds.matches_tag_ids(runner.tags.ids)
# pick builds that does not have other tags than runner's one
builds = builds.matches_tag_ids(runner.tags.ids)
# pick builds that have at least one tag
unless runner.run_untagged?
builds = builds.with_any_tags
end
# pick builds that have at least one tag
unless runner.run_untagged?
builds = builds.with_any_tags
end
builds.find do |build|

5
changelogs/unreleased/remove-ci_job_request_with_tags_matcher.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Remove the ci_job_request_with_tags_matcher
merge_request:
author:
type: performance