summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-06-17 17:01:21 +0200
committerKamil Trzciński <ayufan@ayufan.eu>2018-06-17 17:01:21 +0200
commit55c453858d607b351df4958f78e90146c207e734 (patch)
tree48a4478d7d69b2778560fbabc88e8343d95bf571
parent7b1eb2a669ad2a44dbe89d7d289d72870cbd74e7 (diff)
downloadgitlab-ce-55c453858d607b351df4958f78e90146c207e734.tar.gz
Remove the ci_job_request_with_tags_matcherremove-ci_job_request_with_tags_matcher
-rw-r--r--app/services/ci/register_job_service.rb12
-rw-r--r--changelogs/unreleased/remove-ci_job_request_with_tags_matcher.yml5
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