BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 630be84a by Dmitriy Zaporozhets
Options

Merge branch 'files-rational-git-log' into 'master'

Split commit logs loading #### Before this MR When visit files tab we have ajax call that loads all last commits for files inside directory. Load time depends on amount of files in directory. So if directory has 100 files - you may need to wait up to 20 seconds to get last commits info of files. Still if you do navigation at this time the request still wait for processing taking workers busy. If several people try to navigate through big repository directories - you will see huge performance drop. #### After this MR Load last commits only for first 10 entries. It usually takes not more then a second (even for huge repos). If user still on the same page - do next ajax call and get 10 more entries. If user navigate to another directory - stop ajax calls for this directory. So for cases when you want navigate to nested directory - you don't have long-running ajax calls that takes workers and makes app unusable for other users - - - Fixes #1229
parents 9fd6c3d5 fcb0b76c
Showing with 27 additions and 3 deletions
app/controllers/projects/refs_controller.rb
...@@ -31,9 +31,23 @@ class Projects::RefsController < Projects::ApplicationController ...@@ -31,9 +31,23 @@ class Projects::RefsController < Projects::ApplicationController
end end
def logs_tree def logs_tree
contents = tree.entries @offset = if params[:offset].present?
@logs = contents.map do |content| params[:offset].to_i
file = params[:path] ? File.join(params[:path], content.name) : content.name else
0
end
@limit = 10
@path = params[:path]
contents = []
contents += tree.trees
contents += tree.blobs
contents += tree.submodules
@logs = contents[@offset, @limit].to_a.map do |content|
file = @path ? File.join(@path, content.name) : content.name
last_commit = @repo.last_commit_for_path(@commit.id, file) last_commit = @repo.last_commit_for_path(@commit.id, file)
{ {
file_name: content.name, file_name: content.name,
......
app/views/projects/refs/logs_tree.js.haml
...@@ -7,3 +7,13 @@ ...@@ -7,3 +7,13 @@
var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}"); var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
row.find("td.tree_time_ago").html('#{escape_javascript time_ago_with_tooltip(commit.committed_date)}'); row.find("td.tree_time_ago").html('#{escape_javascript time_ago_with_tooltip(commit.committed_date)}');
row.find("td.tree_commit").html('#{escape_javascript render("projects/tree/tree_commit_column", commit: commit)}'); row.find("td.tree_commit").html('#{escape_javascript render("projects/tree/tree_commit_column", commit: commit)}');
- if @logs.present?
:plain
var current_url = location.href.replace(/\/?$/, '/');
var log_url = '#{project_tree_url(@project, tree_join(@ref, @path || '/'))}'.replace(/\/?$/, '/');
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_project_ref_path(@project, @ref, @path || '/', offset: (@offset + @limit))}');
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment