diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-22 09:21:36 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-22 09:21:36 +0000 |
| commit | a7a0873829ffbb9e69effd5803792cb2614d3581 (patch) | |
| tree | 9e9787fda9f53373727248757286667d7846f38c /app/assets | |
| parent | 5a84b5fd7c5e281de7fad55a308ff35da64f50ca (diff) | |
| parent | 7f67b6c210b201c409176e2a59db771b5fe9b28d (diff) | |
| download | gitlab-ce-a7a0873829ffbb9e69effd5803792cb2614d3581.tar.gz | |
Merge branch '27287-label-dropdown-error-messages' into 'master'
Fix form response errors not shown for create label dropdown.
See merge request !9058
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/create_label.js.es6 | 6 |
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 |