diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-24 12:21:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-24 12:21:03 +0000 |
| commit | 8b41c40674273d6ee3d9b0c720e5e51b76998b31 (patch) | |
| tree | 405d718ca7661d638fcba427cbbd6f7f37f7afe5 | |
| parent | c7b12a41861a4352278c8ff46ad39eb526739cc7 (diff) | |
| parent | 36dc28fd5588bc696f6092a17a831fbd6c2f4334 (diff) | |
| download | gitlab-ce-8b41c40674273d6ee3d9b0c720e5e51b76998b31.tar.gz | |
Merge branch '4950-unassign-slash-command-preview-fix' into 'master'
Fix unassign slash command preview
See merge request gitlab-org/gitlab-ce!18447
| -rw-r--r-- | app/services/quick_actions/interpret_service.rb | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/4950-unassign-slash-command-preview-fix.yml | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/services/quick_actions/interpret_service.rb b/app/services/quick_actions/interpret_service.rb index 6cc51b6ee1b..6804dff2a9b 100644 --- a/app/services/quick_actions/interpret_service.rb +++ b/app/services/quick_actions/interpret_service.rb @@ -138,8 +138,10 @@ module QuickActions 'Remove assignee' end end - explanation do - "Removes #{'assignee'.pluralize(issuable.assignees.size)} #{issuable.assignees.map(&:to_reference).to_sentence}." + explanation do |users = nil| + assignees = issuable.assignees + assignees &= users if users.present? && issuable.allows_multiple_assignees? + "Removes #{'assignee'.pluralize(assignees.size)} #{assignees.map(&:to_reference).to_sentence}." end params do issuable.allows_multiple_assignees? ? '@user1 @user2' : '' diff --git a/changelogs/unreleased/4950-unassign-slash-command-preview-fix.yml b/changelogs/unreleased/4950-unassign-slash-command-preview-fix.yml new file mode 100644 index 00000000000..0b8c14ae699 --- /dev/null +++ b/changelogs/unreleased/4950-unassign-slash-command-preview-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fix unassign slash command preview +merge_request: 18447 +author: +type: fixed |