diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-26 10:02:40 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-26 10:02:40 +0000 |
| commit | d1ceb60068c9c1a8a91e20ddffc108f82f313790 (patch) | |
| tree | 025822a445ea9f387ffd6fb14d62209defea45aa | |
| parent | 336f01c20885e8c648754b7b708ccde07873d415 (diff) | |
| parent | c0145298b3f65151da3bb169c00b631fb8fd7040 (diff) | |
| download | gitlab-ce-d1ceb60068c9c1a8a91e20ddffc108f82f313790.tar.gz | |
Merge branch '43598-fix-duplicate-label-load-failure' into 'master'
Fix Group labels load failure when there are duplicate labels present
Closes #43598
See merge request gitlab-org/gitlab-ce!17353
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/43598-fix-duplicate-label-load-failure.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 5de48aa49a9..7151ac05a09 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -213,7 +213,7 @@ export default class LabelsSelect { } } if (label.duplicate) { - color = gl.DropdownUtils.duplicateLabelColor(label.color); + color = DropdownUtils.duplicateLabelColor(label.color); } else { if (label.color != null) { diff --git a/changelogs/unreleased/43598-fix-duplicate-label-load-failure.yml b/changelogs/unreleased/43598-fix-duplicate-label-load-failure.yml new file mode 100644 index 00000000000..bda4ec84e5c --- /dev/null +++ b/changelogs/unreleased/43598-fix-duplicate-label-load-failure.yml @@ -0,0 +1,5 @@ +--- +title: Fix Group labels load failure when there are duplicate labels present +merge_request: 17353 +author: +type: fixed |