From aee0a117a889461ce8ced6fcf73207fe017f1d99 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Dec 2021 13:37:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-6-stable-ee --- app/models/ci/pending_build.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'app/models/ci/pending_build.rb') diff --git a/app/models/ci/pending_build.rb b/app/models/ci/pending_build.rb index ccad6290fac..41dc74ef050 100644 --- a/app/models/ci/pending_build.rb +++ b/app/models/ci/pending_build.rb @@ -30,6 +30,10 @@ module Ci self.upsert(entry.attributes.compact, returning: %w[build_id], unique_by: :build_id) end + def maintain_denormalized_data? + ::Feature.enabled?(:ci_pending_builds_maintain_denormalized_data, default_enabled: :yaml) + end + private def args_from_build(build) @@ -42,15 +46,9 @@ module Ci namespace: project.namespace } - if Feature.enabled?(:ci_pending_builds_maintain_tags_data, type: :development, default_enabled: :yaml) + if maintain_denormalized_data? args.store(:tag_ids, build.tags_ids) - end - - if Feature.enabled?(:ci_pending_builds_maintain_shared_runners_data, type: :development, default_enabled: :yaml) args.store(:instance_runners_enabled, shared_runners_enabled?(project)) - end - - if Feature.enabled?(:ci_pending_builds_maintain_namespace_traversal_ids, type: :development, default_enabled: :yaml) args.store(:namespace_traversal_ids, project.namespace.traversal_ids) if group_runners_enabled?(project) end -- cgit v1.2.3