Skip to content
Snippets Groups Projects
Commit 27d9abcb authored by Jan Provaznik's avatar Jan Provaznik Committed by James Fargher
Browse files

Add milestone reference to removed milestone note

* adds old milestone reference to system notes
* assures milestone_id is set when in resource milestone event when
  milestone is removed

Changelog: added
parent 04ce462c
No related branches found
No related tags found
2 merge requests!118700Remove refactor_vulnerability_filters feature flag,!117529Add milestone reference to removed milestone note
......@@ -17,6 +17,7 @@ def note_html
def note_text(html: false)
format = milestone&.group_milestone? ? :name : :iid
event.remove? ? 'removed milestone' : "changed milestone to #{milestone.to_reference(project, format: format)}"
reference = milestone&.to_reference(project, format: format)
event.remove? ? "removed milestone #{reference}" : "changed milestone to #{reference}"
end
end
......@@ -290,6 +290,8 @@ def handle_description_updated(issuable)
end
def update(issuable)
old_associations = associations_before_update(issuable)
initialize_callbacks!(issuable)
prepare_update_params(issuable)
......@@ -297,7 +299,6 @@ def update(issuable)
filter_params(issuable)
change_additional_attributes(issuable)
old_associations = associations_before_update(issuable)
assign_requested_labels(issuable)
assign_requested_assignees(issuable)
......
......@@ -11,9 +11,7 @@ module IssuableBaseService
def associations_before_update(issuable)
associations = super
if issuable.escalation_policies_available? && issuable.escalation_status
associations[:escalation_policy] = issuable.escalation_status.policy
end
associations[:escalation_policy] = issuable.escalation_status&.policy if issuable.escalation_policies_available?
associations
end
......
......@@ -11,7 +11,8 @@
let_it_be(:events) do
[
create(:resource_milestone_event, issue: issue, milestone: milestone, action: :add, created_at: '2020-01-01 04:00'),
create(:resource_milestone_event, issue: issue, milestone: milestone, action: :remove, created_at: '2020-01-02 08:00')
create(:resource_milestone_event, issue: issue, milestone: milestone, action: :remove, created_at: '2020-01-02 08:00'),
create(:resource_milestone_event, issue: issue, milestone: nil, action: :remove, created_at: '2020-01-02 08:00')
]
end
......@@ -22,7 +23,8 @@
expect(notes.map(&:note)).to eq(
[
"changed milestone to %#{milestone.iid}",
'removed milestone'
"removed milestone %#{milestone.iid}",
"removed milestone "
])
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment