summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-16 15:56:12 +0100
committerPhil Hughes <me@iamphill.com>2017-08-16 15:56:47 +0100
commit138f07ada72e27e4ffa31ef303d74183168bfdaa (patch)
tree20b588f63ed418100656c4f9866e8e60100664e7
parentee4528526e1bbf58f256c0fcc27873fcdf80daa4 (diff)
downloadgitlab-ce-138f07ada72e27e4ffa31ef303d74183168bfdaa.tar.gz
Fix commit list request appending 40 to offset
Closes #36569
-rw-r--r--app/assets/javascripts/commits.js2
-rw-r--r--changelogs/unreleased/commits-list-page-limit.yml5
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