Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-16 01:40:56 +0400
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-16 01:40:56 +0400
commitb80a0195987295472ef5267fb1004054e7878d20 (patch)
treead3b15ba5faa282bd742879bb7dd241cad3fbdf1 /app
parentf120e5a89a4bfc71ecd941ca9ad27c948b2d847b (diff)
Use tree/blob_actions partial for blame view and fix file name encoding
Diffstat (limited to 'app')
-rw-r--r--app/views/blame/show.html.haml11
1 files changed, 4 insertions, 7 deletions
diff --git a/app/views/blame/show.html.haml b/app/views/blame/show.html.haml
index 8f82b00f924..5c3231e2318 100644
--- a/app/views/blame/show.html.haml
+++ b/app/views/blame/show.html.haml
@@ -1,6 +1,6 @@
= render "head"
-#tree-holder
+#tree-holder.tree-holder
%ul.breadcrumb
%li
%span.arrow
@@ -15,12 +15,9 @@
.file_title
%i.icon-file
%span.file_name
- = @tree.name
- %small blame
- %span.options
- = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
- = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
- = link_to "source", project_tree_path(@project, @id), class: "btn very_small"
+ = @tree.name.force_encoding('utf-8')
+ %small= number_to_human_size @tree.size
+ %span.options= render "tree/blob_actions"
.file_content.blame
%table
- @blame.each do |commit, lines|