Commit b80a0195987295472ef5267fb1004054e7878d20
1 parent
f120e5a8
Exists in
master
and in
4 other branches
Use tree/blob_actions partial for blame view and fix file name encoding
Showing
1 changed file
with
4 additions
and
7 deletions
Show diff stats
app/views/blame/show.html.haml
| 1 | = render "head" | 1 | = render "head" |
| 2 | 2 | ||
| 3 | -#tree-holder | 3 | +#tree-holder.tree-holder |
| 4 | %ul.breadcrumb | 4 | %ul.breadcrumb |
| 5 | %li | 5 | %li |
| 6 | %span.arrow | 6 | %span.arrow |
| @@ -15,12 +15,9 @@ | @@ -15,12 +15,9 @@ | ||
| 15 | .file_title | 15 | .file_title |
| 16 | %i.icon-file | 16 | %i.icon-file |
| 17 | %span.file_name | 17 | %span.file_name |
| 18 | - = @tree.name | ||
| 19 | - %small blame | ||
| 20 | - %span.options | ||
| 21 | - = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank" | ||
| 22 | - = link_to "history", project_commits_path(@project, @id), class: "btn very_small" | ||
| 23 | - = link_to "source", project_tree_path(@project, @id), class: "btn very_small" | 18 | + = @tree.name.force_encoding('utf-8') |
| 19 | + %small= number_to_human_size @tree.size | ||
| 20 | + %span.options= render "tree/blob_actions" | ||
| 24 | .file_content.blame | 21 | .file_content.blame |
| 25 | %table | 22 | %table |
| 26 | - @blame.each do |commit, lines| | 23 | - @blame.each do |commit, lines| |