Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 13 deletions

diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index ab70ba5e17e..a03206c1358 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -40,14 +40,6 @@ module Gitlab
         ::Feature.enabled?(:ci_raise_job_rules_without_workflow_rules_warning, default_enabled: true)
       end
 
-      def self.keep_latest_artifacts_for_ref_enabled?(project)
-        ::Feature.enabled?(:keep_latest_artifacts_for_ref, project, default_enabled: true)
-      end
-
-      def self.destroy_only_unlocked_expired_artifacts_enabled?
-        ::Feature.enabled?(:destroy_only_unlocked_expired_artifacts, default_enabled: true)
-      end
-
       def self.bulk_insert_on_create?(project)
         ::Feature.enabled?(:ci_bulk_insert_on_create, project, default_enabled: true)
       end
diff --git a/lib/gitlab/ci/pipeline/chain/build.rb b/lib/gitlab/ci/pipeline/chain/build.rb
index 4190c40eb66..9662209f88e 100644
--- a/lib/gitlab/ci/pipeline/chain/build.rb
+++ b/lib/gitlab/ci/pipeline/chain/build.rb
@@ -20,11 +20,7 @@ module Gitlab
               pipeline_schedule: @command.schedule,
               merge_request: @command.merge_request,
               external_pull_request: @command.external_pull_request,
-              variables_attributes: Array(@command.variables_attributes),
-              # This should be removed and set on the database column default
-              # level when the keep_latest_artifacts_for_ref feature flag is
-              # removed.
-              locked: ::Gitlab::Ci::Features.keep_latest_artifacts_for_ref_enabled?(@command.project) ? :artifacts_locked : :unlocked
+              variables_attributes: Array(@command.variables_attributes)
             )
           end