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

1 files changed, 2 insertions, 11 deletions

diff --git a/app/services/issuable/clone/attributes_rewriter.rb b/app/services/issuable/clone/attributes_rewriter.rb
index c84074039ea..3861d88bce9 100644
--- a/app/services/issuable/clone/attributes_rewriter.rb
+++ b/app/services/issuable/clone/attributes_rewriter.rb
@@ -18,7 +18,6 @@ module Issuable
         new_entity.update(update_attributes)
 
         copy_resource_label_events
-        copy_resource_weight_events
         copy_resource_milestone_events
         copy_resource_state_events
       end
@@ -55,16 +54,6 @@ module Issuable
         end
       end
 
-      def copy_resource_weight_events
-        return unless both_respond_to?(:resource_weight_events)
-
-        copy_events(ResourceWeightEvent.table_name, original_entity.resource_weight_events) do |event|
-          event.attributes
-            .except('id', 'reference', 'reference_html')
-            .merge('issue_id' => new_entity.id)
-        end
-      end
-
       def copy_resource_milestone_events
         return unless milestone_events_supported?
 
@@ -128,3 +117,5 @@ module Issuable
     end
   end
 end
+
+Issuable::Clone::AttributesRewriter.prepend_if_ee('EE::Issuable::Clone::AttributesRewriter')