summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-09-27 10:45:25 -0400
committerJacob Schatz <jschatz1@gmail.com>2017-09-27 10:45:25 -0400
commitccbfc87998ea8958cc62c1b8fcde1a07fd9f4217 (patch)
tree9f9b961e22e32e4b799b41bf7c60c1951348306d
parente55177561493f4f3166c1ac6a724eafdfacfc790 (diff)
downloadgitlab-ce-faster-load-repo.tar.gz
Add last commit to ruby.faster-load-repo
-rw-r--r--app/controllers/projects/blob_controller.rb2
-rw-r--r--app/controllers/projects/refs_controller.rb4
2 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 2b8f3977e6e..e7b4881fbb3 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -201,6 +201,7 @@ class Projects::BlobController < Projects::ApplicationController
path_segments = @path.split('/')
path_segments.pop
tree_path = path_segments.join('/')
+ last_commit = @repository.last_commit_for_path(@commit.id, @blob.path)
render json: json.merge(
path: blob.path,
@@ -209,6 +210,7 @@ class Projects::BlobController < Projects::ApplicationController
size: blob.raw_size,
mime_type: blob.mime_type,
binary: blob.raw_binary?,
+ last_commit: last_commit,
simple_viewer: blob.simple_viewer&.class&.partial_name,
rich_viewer: blob.rich_viewer&.class&.partial_name,
show_viewer_switcher: !!blob.show_viewer_switcher?,
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index a09937de450..61ab184f286 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -50,7 +50,6 @@ class Projects::RefsController < Projects::ApplicationController
contents.push(*tree.trees)
contents.push(*tree.blobs)
contents.push(*tree.submodules)
-
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37433
@logs = Gitlab::GitalyClient.allow_n_plus_1_calls do
contents[@offset, @limit].to_a.map do |content|
@@ -65,9 +64,6 @@ class Projects::RefsController < Projects::ApplicationController
end
offset = (@offset + @limit)
- if contents.size > offset
- @more_log_url = logs_file_project_ref_path(@project, @ref, @path || '', offset: offset)
- end
render json: @logs
end