diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-31 13:10:12 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-31 13:10:12 +0000 |
commit | d6b39ea7fb31e243c59b0ca66b0fd4de3296f004 (patch) | |
tree | 63a822e502a9f85966d9acd318d9b728da4c8534 | |
parent | 6da156ab4876d946794daa5f48febe88be82fd0e (diff) | |
parent | f5a07117329f72142e560d5ebf1ebbfed39da36c (diff) | |
download | gitlab-ce-d6b39ea7fb31e243c59b0ca66b0fd4de3296f004.tar.gz |
Merge branch '24875-label' into 'master'
Append prioritized label before pagination
Closes #24875
See merge request gitlab-org/gitlab-ce!24815
-rw-r--r-- | app/assets/javascripts/label_manager.js | 13 | ||||
-rw-r--r-- | changelogs/unreleased/24875-label.yml | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/app/assets/javascripts/label_manager.js b/app/assets/javascripts/label_manager.js index 062501d1d04..f134a54dd53 100644 --- a/app/assets/javascripts/label_manager.js +++ b/app/assets/javascripts/label_manager.js @@ -70,7 +70,18 @@ export default class LabelManager { const $detachedLabel = $label.detach(); this.toggleLabelPriorityBadge($detachedLabel, action); - $detachedLabel.appendTo($target); + + const $labelEls = $target.find('li.label-list-item'); + + /* + * If there is a label element in the target, we'd want to + * append the new label just right next to it. + */ + if ($labelEls.length) { + $labelEls.last().after($detachedLabel); + } else { + $detachedLabel.appendTo($target); + } if ($from.find('li').length) { $from.find('.empty-message').removeClass('hidden'); diff --git a/changelogs/unreleased/24875-label.yml b/changelogs/unreleased/24875-label.yml new file mode 100644 index 00000000000..1f9d2222edf --- /dev/null +++ b/changelogs/unreleased/24875-label.yml @@ -0,0 +1,5 @@ +--- +title: Append prioritized label before pagination +merge_request: 24815 +author: +type: fixed |