summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/create_label.js.es6
diff options
context:
space:
mode:
authorTom Koole <tom@tomkoole.com>2017-02-05 22:39:20 -0500
committerTom Koole <tom@tomkoole.com>2017-02-09 09:12:22 -0500
commit7f67b6c210b201c409176e2a59db771b5fe9b28d (patch)
tree84e96049c16e1a283c6fe9a85af5df26870da5e0 /app/assets/javascripts/create_label.js.es6
parent110cd58999abb45f52273f5870fe16a3ad026746 (diff)
downloadgitlab-ce-7f67b6c210b201c409176e2a59db771b5fe9b28d.tar.gz
fix new label errors not visible in dropdown for #27287, also humanize error key, improve testing hieararchy for reuse, remove duplicate test
Diffstat (limited to 'app/assets/javascripts/create_label.js.es6')
-rw-r--r--app/assets/javascripts/create_label.js.es66
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/create_label.js.es6 b/app/assets/javascripts/create_label.js.es6
index 947c129d5b5..85384d98126 100644
--- a/app/assets/javascripts/create_label.js.es6
+++ b/app/assets/javascripts/create_label.js.es6
@@ -107,9 +107,9 @@
if (typeof label.message === 'string') {
errors = label.message;
} else {
- errors = label.message.map(function (value, key) {
- return key + " " + value[0];
- }).join("<br/>");
+ errors = Object.keys(label.message).map(key =>
+ `${gl.text.humanize(key)} ${label.message[key].join(', ')}`
+ ).join("<br/>");
}
this.$newLabelError