Merge branch '36906_Reordering_issues_to_the_bottom' into 'master'

Fixing re-ordering of an issue when dragging it to the bottom a long issue list in the board

Closes #36906

See merge request gitlab-org/gitlab-ce!16250

3 files changed, 18 insertions, 1 deletions

diff --git a/app/assets/javascripts/boards/components/board_list.js b/app/assets/javascripts/boards/components/board_list.js
index 84b76a6f1b1..d8cf532fe78 100644
--- a/app/assets/javascripts/boards/components/board_list.js
+++ b/app/assets/javascripts/boards/components/board_list.js
@@ -187,7 +187,7 @@ export default {
         <li
           class="board-list-count text-center"
           v-if="showCount"
-          data-id="-1">
+          data-issue-id="-1">
 
           <loading-icon
             v-show="list.loadingMore"
diff --git a/changelogs/unreleased/36906-reordering-issues-to-the-bottom.yml b/changelogs/unreleased/36906-reordering-issues-to-the-bottom.yml
new file mode 100644
index 00000000000..0ab765a43b7
--- /dev/null
+++ b/changelogs/unreleased/36906-reordering-issues-to-the-bottom.yml
@@ -0,0 +1,5 @@
+---
+title: "Issue board: fix for dragging an issue to the very bottom in long lists"
+merge_request: 16250
+author: David Kuri
+type: fixed
\ No newline at end of file
diff --git a/spec/javascripts/boards/board_list_spec.js b/spec/javascripts/boards/board_list_spec.js
index 7c5888b6d82..b7cc3a8813e 100644
--- a/spec/javascripts/boards/board_list_spec.js
+++ b/spec/javascripts/boards/board_list_spec.js
@@ -154,6 +154,18 @@ describe('Board list component', () => {
     });
   });
 
+  it('sets data attribute with invalid id', (done) => {
+    component.showCount = true;
+
+    Vue.nextTick(() => {
+      expect(
+        component.$el.querySelector('.board-list-count').getAttribute('data-issue-id'),
+      ).toBe('-1');
+
+      done();
+    });
+  });
+
   it('shows how many more issues to load', (done) => {
     component.showCount = true;
     component.list.issuesSize = 20;