Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

2 files changed, 28 insertions, 2 deletions

diff --git a/app/workers/design_management/copy_design_collection_worker.rb b/app/workers/design_management/copy_design_collection_worker.rb
new file mode 100644
index 00000000000..0a6e23fe9da
--- /dev/null
+++ b/app/workers/design_management/copy_design_collection_worker.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module DesignManagement
+  class CopyDesignCollectionWorker
+    include ApplicationWorker
+
+    feature_category :design_management
+    idempotent!
+    urgency :low
+
+    def perform(user_id, issue_id, target_issue_id)
+      user = User.find(user_id)
+      issue = Issue.find(issue_id)
+      target_issue = Issue.find(target_issue_id)
+
+      response = DesignManagement::CopyDesignCollection::CopyService.new(
+        target_issue.project,
+        user,
+        issue: issue,
+        target_issue: target_issue
+      ).execute
+
+      Gitlab::AppLogger.warn(response.message) if response.error?
+    end
+  end
+end
diff --git a/app/workers/design_management/new_version_worker.rb b/app/workers/design_management/new_version_worker.rb
index 3634dcbcebd..4fbf2067be4 100644
--- a/app/workers/design_management/new_version_worker.rb
+++ b/app/workers/design_management/new_version_worker.rb
@@ -9,10 +9,10 @@ module DesignManagement
     # `GenerateImageVersionsService` resizing designs
     worker_resource_boundary :memory
 
-    def perform(version_id)
+    def perform(version_id, skip_system_notes = false)
       version = DesignManagement::Version.find(version_id)
 
-      add_system_note(version)
+      add_system_note(version) unless skip_system_notes
       generate_image_versions(version)
     rescue ActiveRecord::RecordNotFound => e
       Sidekiq.logger.warn(e)