diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-23 11:43:38 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-23 11:43:38 +0000 |
commit | 747bf698e6934ce4ab0ea8140cf43ca3fca783cb (patch) | |
tree | e2cfb453d61fcc659ac0e85872c5a58afb93dffa | |
parent | dc058e153c3c91a0debe4277f17797ad34ea9f04 (diff) | |
parent | 8df5b369979ca3c34182f49cc734b01cab861f21 (diff) | |
download | gitlab-ce-747bf698e6934ce4ab0ea8140cf43ca3fca783cb.tar.gz |
Merge branch 'issue-boards-cant-drag-fix' into 'master'
Fixed bug stopping issue boards cards being dragged
Closes #29576
See merge request !10139
-rw-r--r-- | app/assets/javascripts/boards/components/board_list.js | 2 | ||||
-rw-r--r-- | changelogs/unreleased/issue-boards-cant-drag-fix.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/board_list.js b/app/assets/javascripts/boards/components/board_list.js index 9248d036497..86e6c26e570 100644 --- a/app/assets/javascripts/boards/components/board_list.js +++ b/app/assets/javascripts/boards/components/board_list.js @@ -48,7 +48,7 @@ import boardCard from './board_card'; this.list.getIssues(false); } - if (this.scrollHeight() > this.listHeight()) { + if (this.scrollHeight() > Math.ceil(this.listHeight())) { this.showCount = true; } else { this.showCount = false; diff --git a/changelogs/unreleased/issue-boards-cant-drag-fix.yml b/changelogs/unreleased/issue-boards-cant-drag-fix.yml new file mode 100644 index 00000000000..ac92573abe8 --- /dev/null +++ b/changelogs/unreleased/issue-boards-cant-drag-fix.yml @@ -0,0 +1,4 @@ +--- +title: Fixed bug in issue boards which stopped cards being able to be dragged +merge_request: +author: |