diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-17 18:10:43 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-06-17 18:10:43 +0000 |
| commit | 937c1b5be91be4b500fa7cc1faf5d1aabbd16d41 (patch) | |
| tree | 7335ac5d9a06bf5a482216d15a62f85d23b9955f | |
| parent | 1e22513afde6fb1d3a604e88e1a8f944b07dd858 (diff) | |
| parent | 55c453858d607b351df4958f78e90146c207e734 (diff) | |
| download | gitlab-ce-937c1b5be91be4b500fa7cc1faf5d1aabbd16d41.tar.gz | |
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
| -rw-r--r-- | app/services/ci/register_job_service.rb | 12 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-ci_job_request_with_tags_matcher.yml | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index 925775aea0b..9bdbb2c0d99 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -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| diff --git a/changelogs/unreleased/remove-ci_job_request_with_tags_matcher.yml b/changelogs/unreleased/remove-ci_job_request_with_tags_matcher.yml new file mode 100644 index 00000000000..b86512445d5 --- /dev/null +++ b/changelogs/unreleased/remove-ci_job_request_with_tags_matcher.yml @@ -0,0 +1,5 @@ +--- +title: Remove the ci_job_request_with_tags_matcher +merge_request: +author: +type: performance |