Commit 98103688 authored by Michael Kozono's avatar Michael Kozono

Merge branch '259609-move-resource-weight-event-model-to-ee' into 'master'

Move ResourceWeightevent model to EE

See merge request gitlab-org/gitlab!43970
parents e885b3fe b9820177
...@@ -18,7 +18,6 @@ module Issuable ...@@ -18,7 +18,6 @@ module Issuable
new_entity.update(update_attributes) new_entity.update(update_attributes)
copy_resource_label_events copy_resource_label_events
copy_resource_weight_events
copy_resource_milestone_events copy_resource_milestone_events
copy_resource_state_events copy_resource_state_events
end end
...@@ -55,16 +54,6 @@ module Issuable ...@@ -55,16 +54,6 @@ module Issuable
end end
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 def copy_resource_milestone_events
return unless milestone_events_supported? return unless milestone_events_supported?
...@@ -128,3 +117,5 @@ module Issuable ...@@ -128,3 +117,5 @@ module Issuable
end end
end end
end end
Issuable::Clone::AttributesRewriter.prepend_if_ee('EE::Issuable::Clone::AttributesRewriter')
# frozen_string_literal: true
module EE
module Issuable
module Clone
module AttributesRewriter
extend ::Gitlab::Utils::Override
override :execute
def execute
super
copy_resource_weight_events
end
private
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').merge('issue_id' => new_entity.id)
end
end
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment