diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-02 00:32:44 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-06 03:05:39 +0300 |
| commit | d950556be80154f7a2e12521e8e86b41cc1e212d (patch) | |
| tree | c20827b7674db38279ca2d6a97b97b7484db75b7 /spec/javascripts | |
| parent | d4aff2e7836c006c7b7c759eb11f505422b1bab6 (diff) | |
Merge branch 'issue-boards-issues-total-count' into 'master'
Add the total number of issues in the JSON response in issue board lists
Add the total number of issues in the JSON response in issue board lists
The issue board lists should always show the total number of issues in the list, not the current amount fetched by endless scroll.
Closes #21327
See merge request !5904
Conflicts:
app/assets/stylesheets/pages/boards.scss
app/views/projects/boards/components/_board.html.haml
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/boards/mock_data.js.es6 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/spec/javascripts/boards/mock_data.js.es6 b/spec/javascripts/boards/mock_data.js.es6 index 0c37ec8354f..f3797ed44d4 100644 --- a/spec/javascripts/boards/mock_data.js.es6 +++ b/spec/javascripts/boards/mock_data.js.es6 @@ -26,12 +26,15 @@ const listObjDuplicate = { const BoardsMockData = { 'GET': { - '/test/issue-boards/board/lists{/id}/issues': [{ - title: 'Testing', - iid: 1, - confidential: false, - labels: [] - }] + '/test/issue-boards/board/lists{/id}/issues': { + issues: [{ + title: 'Testing', + iid: 1, + confidential: false, + labels: [] + }], + size: 1 + } }, 'POST': { '/test/issue-boards/board/lists{/id}': listObj |