Commit 94af622c879681683c84b6537c2adea52c78b2a2
1 parent
339dfa32
Exists in
master
and in
4 other branches
Move refs/blame view to blame/show
Showing
2 changed files
with
40 additions
and
40 deletions
Show diff stats
| @@ -0,0 +1,40 @@ | @@ -0,0 +1,40 @@ | ||
| 1 | += render "head" | ||
| 2 | + | ||
| 3 | +#tree-holder | ||
| 4 | + %ul.breadcrumb | ||
| 5 | + %li | ||
| 6 | + %span.arrow | ||
| 7 | + = link_to project_tree_path(@project, @ref) do | ||
| 8 | + = @project.name | ||
| 9 | + - @tree.breadcrumbs(6) do |link| | ||
| 10 | + \/ | ||
| 11 | + %li= link | ||
| 12 | + .clear | ||
| 13 | + | ||
| 14 | + .file_holder | ||
| 15 | + .file_title | ||
| 16 | + %i.icon-file | ||
| 17 | + %span.file_name | ||
| 18 | + = @tree.name | ||
| 19 | + %small blame | ||
| 20 | + %span.options | ||
| 21 | + = link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank" | ||
| 22 | + = link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small" | ||
| 23 | + = link_to "source", project_tree_path(@project, tree_join(@ref, params[:path])), class: "btn very_small" | ||
| 24 | + .file_content.blame | ||
| 25 | + %table | ||
| 26 | + - @blame.each do |commit, lines| | ||
| 27 | + - commit = Commit.new(commit) | ||
| 28 | + - commit = CommitDecorator.decorate(commit) | ||
| 29 | + %tr | ||
| 30 | + %td.author | ||
| 31 | + = image_tag gravatar_icon(commit.author_email, 16) | ||
| 32 | + = commit.author_name | ||
| 33 | + %td.blame_commit | ||
| 34 | + | ||
| 35 | + %code= link_to commit.short_id, project_commit_path(@project, commit) | ||
| 36 | + = link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, commit), class: "row_title" rescue "--broken encoding" | ||
| 37 | + %td.lines | ||
| 38 | + = preserve do | ||
| 39 | + %pre | ||
| 40 | + = Gitlab::Encode.utf8 lines.join("\n") |
app/views/refs/blame.html.haml
| @@ -1,40 +0,0 @@ | @@ -1,40 +0,0 @@ | ||
| 1 | -= render "head" | ||
| 2 | - | ||
| 3 | -#tree-holder | ||
| 4 | - %ul.breadcrumb | ||
| 5 | - %li | ||
| 6 | - %span.arrow | ||
| 7 | - = link_to project_tree_path(@project, @ref) do | ||
| 8 | - = @project.name | ||
| 9 | - - @tree.breadcrumbs(6) do |link| | ||
| 10 | - \/ | ||
| 11 | - %li= link | ||
| 12 | - .clear | ||
| 13 | - | ||
| 14 | - .file_holder | ||
| 15 | - .file_title | ||
| 16 | - %i.icon-file | ||
| 17 | - %span.file_name | ||
| 18 | - = @tree.name | ||
| 19 | - %small blame | ||
| 20 | - %span.options | ||
| 21 | - = link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank" | ||
| 22 | - = link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small" | ||
| 23 | - = link_to "source", project_tree_path(@project, tree_join(@ref, params[:path])), class: "btn very_small" | ||
| 24 | - .file_content.blame | ||
| 25 | - %table | ||
| 26 | - - @blame.each do |commit, lines| | ||
| 27 | - - commit = Commit.new(commit) | ||
| 28 | - - commit = CommitDecorator.decorate(commit) | ||
| 29 | - %tr | ||
| 30 | - %td.author | ||
| 31 | - = image_tag gravatar_icon(commit.author_email, 16) | ||
| 32 | - = commit.author_name | ||
| 33 | - %td.blame_commit | ||
| 34 | - | ||
| 35 | - %code= link_to commit.short_id, project_commit_path(@project, commit) | ||
| 36 | - = link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, commit), class: "row_title" rescue "--broken encoding" | ||
| 37 | - %td.lines | ||
| 38 | - = preserve do | ||
| 39 | - %pre | ||
| 40 | - = Gitlab::Encode.utf8 lines.join("\n") |