diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-16 16:28:39 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-18 11:51:37 -0500 |
| commit | 0d959713a370ec880e55815275dbabdb3d5a03e1 (patch) | |
| tree | 5baf2afed04c3f9db26c7d56b8001594c92598cb | |
| parent | 3cb4352b0141d6471cfedffb646ecd4ff6d42b9a (diff) | |
| download | gitlab-ce-0d959713a370ec880e55815275dbabdb3d5a03e1.tar.gz | |
Merge branch 'commits-list-page-limit' into 'master'
Fix commit list request appending 40 to offset
Closes #36569 and #36563
See merge request !13603
| -rw-r--r-- | app/assets/javascripts/commits.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/commits-list-page-limit.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/commits.js b/app/assets/javascripts/commits.js index 2b0bf49cf92..047544b1762 100644 --- a/app/assets/javascripts/commits.js +++ b/app/assets/javascripts/commits.js @@ -17,7 +17,7 @@ window.CommitsList = (function() { } }); - Pager.init(limit, false, false, this.processCommits); + Pager.init(parseInt(limit, 10), false, false, this.processCommits); this.content = $("#commits-list"); this.searchField = $("#commits-search"); diff --git a/changelogs/unreleased/commits-list-page-limit.yml b/changelogs/unreleased/commits-list-page-limit.yml new file mode 100644 index 00000000000..2fd54c5960a --- /dev/null +++ b/changelogs/unreleased/commits-list-page-limit.yml @@ -0,0 +1,5 @@ +--- +title: Fix commit list not loading the correct page when scrolling +merge_request: +author: +type: fixed |