diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-09 09:00:57 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-10 10:48:39 +0100 |
| commit | 10f17c2fcd50d4e4b5bad59a5ae2fb4a13a037d8 (patch) | |
| tree | c3d9ee64ecc55c952659399ab9e0370818ee7253 | |
| parent | e0f3e44b3e67b80543b6956c7ae46035fabc696f (diff) | |
| download | gitlab-ce-label-create-error-messages.tar.gz | |
Correctly shows label errors in dropdownlabel-create-error-messages
Fixes #18344
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index ec74dfaae1a..439c3153392 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -95,8 +95,11 @@ class @LabelsSelect $newLabelCreateButton.enable() if label.message? + errors = _.map label.message, (value, key) -> + "#{key} #{value[0]}" + $newLabelError - .text label.message + .html errors.join("<br/>") .show() else $('.dropdown-menu-back', $dropdown.parent()).trigger 'click' |