summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-31 08:24:18 +0000
committerDouwe Maan <douwe@gitlab.com>2015-03-31 08:24:18 +0000
commit33a8f53f7a8fdc40d0f0ee4245258c8dba99198a (patch)
treea0321f29865ab4394a1438ddb5ac1874fe0239dd
parent28e5c42f809c342d57150a96b7b978c9e5b2b0f4 (diff)
parent82db3dc8b06a7af97c85bd2ac54652a52739f831 (diff)
downloadgitlab-ce-33a8f53f7a8fdc40d0f0ee4245258c8dba99198a.tar.gz
Merge branch 'file-commit-list' into 'master'
Fixed issue where only 25 commits would load in file listings Fixes #1310 See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages. See merge request !477
-rw-r--r--app/views/projects/refs/logs_tree.js.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/refs/logs_tree.js.haml b/app/views/projects/refs/logs_tree.js.haml
index 49ce6c0888e..35c15cf3a9e 100644
--- a/app/views/projects/refs/logs_tree.js.haml
+++ b/app/views/projects/refs/logs_tree.js.haml
@@ -15,5 +15,5 @@
if(current_url == log_url) {
// Load 10 more commit log for each file in tree
// if we still on the same page
- ajaxGet('#{logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '/', offset: (@offset + @limit))}');
+ ajaxGet('#{logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '', offset: (@offset + @limit))}');
}