Merge branch 'issue-30101' into 'master'

Update 'removed assignee' note to include old assignee reference

Closes #30101

See merge request gitlab-org/gitlab-ce!16301

app/services/system_note_service.rb

@@ -68,8 +68,6 @@ module SystemNoteService
   #
   # Returns the created Note object
   def change_issue_assignees(issue, project, author, old_assignees)
-    body =
-      if issue.assignees.any? && old_assignees.any?
     unassigned_users = old_assignees - issue.assignees
     added_users = issue.assignees.to_a - old_assignees
 
@@ -77,12 +75,7 @@ module SystemNoteService
     text_parts << "assigned to #{added_users.map(&:to_reference).to_sentence}" if added_users.any?
     text_parts << "unassigned #{unassigned_users.map(&:to_reference).to_sentence}" if unassigned_users.any?
 
-        text_parts.join(' and ')
-      elsif old_assignees.any?
-        "removed assignee"
-      elsif issue.assignees.any?
-        "assigned to #{issue.assignees.map(&:to_reference).to_sentence}"
-      end
+    body = text_parts.join(' and ')
 
     create_note(NoteSummary.new(issue, project, author, body, action: 'assignee'))
   end

changelogs/unreleased/16301-update-removed-assignee-note-to-include-old-assignee-reference.yml

+---
+title: "Update 'removed assignee' note to include old assignee reference"
+merge_request: 16301
+author: Maurizio De Santis
+type: changed

spec/services/system_note_service_spec.rb

@@ -158,7 +158,7 @@ describe SystemNoteService do
     end
 
     it 'builds a correct phrase when assignee removed' do
-      expect(build_note([assignee1], [])).to eq 'removed assignee'
+      expect(build_note([assignee1], [])).to eq "unassigned @#{assignee1.username}"
     end
 
     it 'builds a correct phrase when assignees changed' do