Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 15 insertions, 5 deletions

diff --git a/app/services/ci/pipeline_artifacts/create_code_quality_mr_diff_report_service.rb b/app/services/ci/pipeline_artifacts/create_code_quality_mr_diff_report_service.rb
index d6865efac9f..aeb68a75f88 100644
--- a/app/services/ci/pipeline_artifacts/create_code_quality_mr_diff_report_service.rb
+++ b/app/services/ci/pipeline_artifacts/create_code_quality_mr_diff_report_service.rb
@@ -13,21 +13,31 @@ module Ci
         return if pipeline.has_codequality_mr_diff_report?
         return unless new_errors_introduced?
 
+        pipeline.pipeline_artifacts.create!(**artifact_attributes)
+      end
+
+      private
+
+      attr_reader :pipeline
+
+      def artifact_attributes
         file = build_carrierwave_file!
 
-        pipeline.pipeline_artifacts.create!(
+        attributes = {
           project_id: pipeline.project_id,
           file_type: :code_quality_mr_diff,
           file_format: Ci::PipelineArtifact::REPORT_TYPES.fetch(:code_quality_mr_diff),
           size: file["tempfile"].size,
           file: file,
           expire_at: Ci::PipelineArtifact::EXPIRATION_DATE.from_now
-        )
-      end
+        }
 
-      private
+        if ::Feature.enabled?(:ci_update_unlocked_pipeline_artifacts, pipeline.project)
+          attributes[:locked] = pipeline.locked
+        end
 
-      attr_reader :pipeline
+        attributes
+      end
 
       def merge_requests
         strong_memoize(:merge_requests) do