summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-17 09:23:00 -0500
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-05-17 20:59:26 +0300
commitd3b24a7638de71ee1286200978e0b6d0b33d0753 (patch)
tree498c4ed238cae6026acc38cb087a3152ee20dfa3 /app/views
parentfb67ea491ba86cb012e58d0e338039acd61400dd (diff)
downloadgitlab-ce-d3b24a7638de71ee1286200978e0b6d0b33d0753.tar.gz
Show last commit for current tree on tree page
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/blob/_blob.html.haml3
-rw-r--r--app/views/projects/tree/show.html.haml2
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml
index 8af945ddb2c..c90a7440480 100644
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
@@ -3,8 +3,7 @@
.info-well.hidden-xs
.well-segment
%ul.blob-commit-info
- - blob_commit = @repository.last_commit_for_path(@commit.id, blob.path)
- = render blob_commit, project: @project, ref: @ref
+ = render 'projects/commits/commit', commit: @last_commit, project: @project, ref: @ref
- auxiliary_viewer = blob.auxiliary_viewer
- if auxiliary_viewer && !auxiliary_viewer.render_error
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index b45a270db4e..b51955010ce 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -7,4 +7,4 @@
= render 'projects/last_push'
%div{ class: container_class }
- = render 'projects/files', commit: @commit, project: @project, ref: @ref
+ = render 'projects/files', commit: @last_commit, project: @project, ref: @ref