diff options
author | Rémy Coutable <remy@rymai.me> | 2018-01-16 11:02:21 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-16 11:02:21 +0000 |
commit | 644f91552c2db87065796d3848dccc01ad939eb9 (patch) | |
tree | 519e2a755afae4455080c0bbed15becf05ebcf97 /app | |
parent | ff252f61f73353ae3912707877c350bd6f7eb038 (diff) | |
parent | d19b68b6edb8b3801ce5c00efe27d22ae3afd962 (diff) | |
download | gitlab-ce-644f91552c2db87065796d3848dccc01ad939eb9.tar.gz |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/services/system_note_service.rb | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 30a5aab13bf..06b23cd7076 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -68,21 +68,14 @@ 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 - - text_parts = [] - 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 + unassigned_users = old_assignees - issue.assignees + added_users = issue.assignees.to_a - old_assignees + + text_parts = [] + 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? + + body = text_parts.join(' and ') create_note(NoteSummary.new(issue, project, author, body, action: 'assignee')) end |