Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-09 11:00:57 +0300
committerPhil Hughes <me@iamphill.com>2016-06-10 12:48:39 +0300
commit10f17c2fcd50d4e4b5bad59a5ae2fb4a13a037d8 (patch)
treec3d9ee64ecc55c952659399ab9e0370818ee7253 /app
parente0f3e44b3e67b80543b6956c7ae46035fabc696f (diff)
Correctly shows label errors in dropdown
Fixes #18344
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/labels_select.js.coffee5
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'