Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

3 files changed, 8 insertions, 2 deletions

diff --git a/app/services/issuable/bulk_update_service.rb b/app/services/issuable/bulk_update_service.rb
index 6d215d7a3b9..273a12f386a 100644
--- a/app/services/issuable/bulk_update_service.rb
+++ b/app/services/issuable/bulk_update_service.rb
@@ -29,7 +29,7 @@ module Issuable
       items.each do |issuable|
         next unless can?(current_user, :"update_#{type}", issuable)
 
-        update_class.new(issuable.project, current_user, params).execute(issuable)
+        update_class.new(issuable.issuing_parent, current_user, params).execute(issuable)
       end
 
       {
diff --git a/app/services/issuable/clone/attributes_rewriter.rb b/app/services/issuable/clone/attributes_rewriter.rb
index 0300cc0d8d3..3c061d35558 100644
--- a/app/services/issuable/clone/attributes_rewriter.rb
+++ b/app/services/issuable/clone/attributes_rewriter.rb
@@ -17,6 +17,8 @@ module Issuable
       private
 
       def cloneable_milestone
+        return unless new_entity.supports_milestone?
+
         title = original_entity.milestone&.title
         return unless title
 
diff --git a/app/services/issuable/clone/content_rewriter.rb b/app/services/issuable/clone/content_rewriter.rb
index 00d7078859d..f75b51c4be3 100644
--- a/app/services/issuable/clone/content_rewriter.rb
+++ b/app/services/issuable/clone/content_rewriter.rb
@@ -23,10 +23,14 @@ module Issuable
       end
 
       def rewrite_notes
+        new_discussion_ids = {}
         original_entity.notes_with_associations.find_each do |note|
           new_note = note.dup
+          new_discussion_ids[note.discussion_id] ||= Discussion.discussion_id(new_note)
           new_params = {
-            project: new_entity.project, noteable: new_entity,
+            project: new_entity.project,
+            noteable: new_entity,
+            discussion_id: new_discussion_ids[note.discussion_id],
             note: rewrite_content(new_note.note),
             note_html: nil,
             created_at: note.created_at,