Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

7 files changed, 43 insertions, 34 deletions

diff --git a/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb b/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
index 6c5fba37d7b..fe0ab01e4fd 100644
--- a/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
+++ b/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
@@ -26,10 +26,10 @@ module Gitlab
           log_info(message: "Started uploading project", export_size: export_size)
 
           upload_duration = Benchmark.realtime do
-            if Feature.enabled?(:import_export_web_upload_stream) && !project.export_file.file_storage?
-              upload_project_as_remote_stream
-            else
+            if project.export_file.file_storage?
               handle_response_error(send_file)
+            else
+              upload_project_as_remote_stream
             end
           end
 
diff --git a/lib/gitlab/import_export/base/relation_factory.rb b/lib/gitlab/import_export/base/relation_factory.rb
index bbec473d29d..b05d9cb2489 100644
--- a/lib/gitlab/import_export/base/relation_factory.rb
+++ b/lib/gitlab/import_export/base/relation_factory.rb
@@ -15,19 +15,19 @@ module Gitlab
         UNIQUE_RELATIONS = %i[].freeze
 
         USER_REFERENCES = %w[
-           author_id
-           assignee_id
-           updated_by_id
-           merged_by_id
-           latest_closed_by_id
-           user_id
-           created_by_id
-           last_edited_by_id
-           merge_user_id
-           resolved_by_id
-           closed_by_id
-           owner_id
-         ].freeze
+          author_id
+          assignee_id
+          updated_by_id
+          merged_by_id
+          latest_closed_by_id
+          user_id
+          created_by_id
+          last_edited_by_id
+          merge_user_id
+          resolved_by_id
+          closed_by_id
+          owner_id
+        ].freeze
 
         TOKEN_RESET_MODELS = %i[Project Namespace Group Ci::Trigger Ci::Build Ci::Runner ProjectHook ErrorTracking::ProjectErrorTrackingSetting].freeze
 
diff --git a/lib/gitlab/import_export/json/streaming_serializer.rb b/lib/gitlab/import_export/json/streaming_serializer.rb
index 99396d64779..cf62f181366 100644
--- a/lib/gitlab/import_export/json/streaming_serializer.rb
+++ b/lib/gitlab/import_export/json/streaming_serializer.rb
@@ -175,21 +175,22 @@ module Gitlab
           order_expression = arel_table[column].public_send(direction).public_send(nulls_position) # rubocop:disable GitlabSecurity/PublicSend
           reverse_order_expression = arel_table[column].public_send(reverse_direction).public_send(reverse_nulls_position) # rubocop:disable GitlabSecurity/PublicSend
 
-          ::Gitlab::Pagination::Keyset::Order.build([
-            ::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-              attribute_name: column,
-              column_expression: arel_table[column],
-              order_expression: order_expression,
-              reversed_order_expression: reverse_order_expression,
-              order_direction: direction,
-              nullable: nulls_position,
-              distinct: false
-            ),
-            ::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-              attribute_name: klass.primary_key,
-              order_expression: arel_order_classes[direction].new(arel_table[klass.primary_key.to_sym])
-            )
-          ])
+          ::Gitlab::Pagination::Keyset::Order.build(
+            [
+              ::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
+                attribute_name: column,
+                column_expression: arel_table[column],
+                order_expression: order_expression,
+                reversed_order_expression: reverse_order_expression,
+                order_direction: direction,
+                nullable: nulls_position,
+                distinct: false
+              ),
+              ::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
+                attribute_name: klass.primary_key,
+                order_expression: arel_order_classes[direction].new(arel_table[klass.primary_key.to_sym])
+              )
+            ])
         end
 
         def read_from_replica_if_available(&block)
diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index 33e4823f192..fb44aaf094e 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -98,6 +98,7 @@ tree:
         - :statuses
       - :external_pull_request
       - :merge_request
+      - :pipeline_metadata
     - :auto_devops
     - :pipeline_schedules
     - :container_expiration_policy
@@ -582,6 +583,9 @@ included_attributes:
     - :iid
     - :source_sha
     - :target_sha
+  pipeline_metadata:
+    - :project_id
+    - :title
   stages:
     - :name
     - :status
@@ -971,6 +975,8 @@ excluded_attributes:
     - :external_pull_request_id
     - :ci_ref_id
     - :locked
+  pipeline_metadata:
+    - :pipeline_id
   stages:
     - :pipeline_id
   merge_access_levels:
diff --git a/lib/gitlab/import_export/project/import_task.rb b/lib/gitlab/import_export/project/import_task.rb
index 89f2b36ea58..4ea47a5624a 100644
--- a/lib/gitlab/import_export/project/import_task.rb
+++ b/lib/gitlab/import_export/project/import_task.rb
@@ -64,7 +64,7 @@ module Gitlab
         end
 
         def execute_sidekiq_job
-          Sidekiq::Worker.drain_all
+          Sidekiq::Worker.drain_all # rubocop:disable Cop/SidekiqApiUsage
         end
 
         def full_path
diff --git a/lib/gitlab/import_export/project/relation_factory.rb b/lib/gitlab/import_export/project/relation_factory.rb
index c4b0e24e34a..568315930d8 100644
--- a/lib/gitlab/import_export/project/relation_factory.rb
+++ b/lib/gitlab/import_export/project/relation_factory.rb
@@ -13,6 +13,7 @@ module Gitlab
                       pipeline_schedules: 'Ci::PipelineSchedule',
                       builds: 'Ci::Build',
                       runners: 'Ci::Runner',
+                      pipeline_metadata: 'Ci::PipelineMetadata',
                       hooks: 'ProjectHook',
                       merge_access_levels: 'ProtectedBranch::MergeAccessLevel',
                       push_access_levels: 'ProtectedBranch::PushAccessLevel',
diff --git a/lib/gitlab/import_export/uploads_manager.rb b/lib/gitlab/import_export/uploads_manager.rb
index ad19508fb99..bc0563729a7 100644
--- a/lib/gitlab/import_export/uploads_manager.rb
+++ b/lib/gitlab/import_export/uploads_manager.rb
@@ -86,8 +86,9 @@ module Gitlab
         mkdir_p(File.join(uploads_export_path, secret))
 
         download_or_copy_upload(upload, upload_path)
-      rescue Errno::ENAMETOOLONG => e
-        # Do not fail entire project export if downloaded file has filename that exceeds 255 characters.
+      rescue StandardError => e
+        # Do not fail entire project export if something goes wrong during file download
+        # (e.g. downloaded file has filename that exceeds 255 characters).
         # Ignore raised exception, skip such upload, log the error and keep going with the export instead.
         Gitlab::ErrorTracking.log_exception(e, project_id: @project.id)
       end