summaryrefslogtreecommitdiff
path: root/app/views/projects/blob
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-05-17 20:07:52 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-05-17 20:07:52 +0000
commitc75f1d3d441443a7effbeba74bdad7348432e299 (patch)
treea9908dc81cf1fdf9c76a9271e7a65a319bf156bd /app/views/projects/blob
parent319cab4115380d3bff1e6543b759e785aa36a666 (diff)
parentafef4a6676543dc8552a89c2ed7e76fae1efe834 (diff)
downloadgitlab-ce-c75f1d3d441443a7effbeba74bdad7348432e299.tar.gz
Merge branch 'dm-tree-last-commit' into 'master'
Show last commit for current tree on tree page See merge request !11442
Diffstat (limited to 'app/views/projects/blob')
-rw-r--r--app/views/projects/blob/_blob.html.haml3
1 files changed, 1 insertions, 2 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