diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-10 15:38:32 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-10 15:38:32 +0000 |
| commit | c7eecb4a203cac4994cfa700a630c569ee3398eb (patch) | |
| tree | 15c2d311fbe16b4183f632c9e946b70285467de5 | |
| parent | e99559260bbfe495e8bf5a22ba86e0ec4f1e31ed (diff) | |
| parent | 10f17c2fcd50d4e4b5bad59a5ae2fb4a13a037d8 (diff) | |
| download | gitlab-ce-c7eecb4a203cac4994cfa700a630c569ee3398eb.tar.gz | |
Merge branch 'label-create-error-messages' into 'master'
Correctly shows label errors in dropdown
## What does this MR do?
Correctly shows any errors in the dropdown when creating a new label
## What are the relevant issue numbers?
Closes #18344
## Screenshots (if relevant)
See merge request !4553
| -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 6b86b51589c..9ca88f1226e 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' |