diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-25 19:54:41 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-27 14:08:07 -0500 |
| commit | b0aec417bf7c5b35817814d5946170f3a3b4966d (patch) | |
| tree | c26a4a74f1e5defa22e63660d81f06c640ace8cc /app | |
| parent | 8829bf186c1e2354dd613fa20cc6abb60e0f759e (diff) | |
| download | gitlab-ce-b0aec417bf7c5b35817814d5946170f3a3b4966d.tar.gz | |
Merge branch 'label-select-toggle' into 'master'
Fixed label select toggle not updating correctly
Closes #26119
See merge request !8601
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index ec2fc87bece..4dbc82a73c4 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -336,7 +336,11 @@ .removeClass('is-active') } - if ($dropdown.hasClass('js-filter-bulk-update') || $dropdown.hasClass('js-issuable-form-dropdown')) { + if ($dropdown.hasClass('js-issuable-form-dropdown')) { + return; + } + + if ($dropdown.hasClass('js-filter-bulk-update')) { _this.enableBulkLabelDropdown(); _this.setDropdownData($dropdown, isMarking, this.id(label)); return; |