summaryrefslogtreecommitdiff
path: root/app/views/refs
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-09-17 12:39:57 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-09-26 16:32:21 -0400
commit79a02df92e18137787371468be5c8897ad2f97b0 (patch)
tree1046a026f22069ee0dc53ec028ca35f4f2da37a8 /app/views/refs
parente33cbb9b4252e2617bcb4c3f850c47aae43e4d83 (diff)
downloadgitlab-ce-79a02df92e18137787371468be5c8897ad2f97b0.tar.gz
Update usages of tree_file_project_ref_path to project_tree_path
Diffstat (limited to 'app/views/refs')
-rw-r--r--app/views/refs/_head.html.haml2
-rw-r--r--app/views/refs/blame.html.haml4
-rw-r--r--app/views/refs/logs_tree.js.haml2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/refs/_head.html.haml b/app/views/refs/_head.html.haml
index 3592f5737ce..2a6052a1122 100644
--- a/app/views/refs/_head.html.haml
+++ b/app/views/refs/_head.html.haml
@@ -2,7 +2,7 @@
%li
= render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
%li{class: "#{'active' if (controller.controller_name == "refs") }"}
- = link_to tree_project_ref_path(@project, @ref) do
+ = link_to project_tree_path(@project, @ref) do
Source
%li.right
.input-prepend.project_clone_holder
diff --git a/app/views/refs/blame.html.haml b/app/views/refs/blame.html.haml
index ba0fad5286d..75b86315031 100644
--- a/app/views/refs/blame.html.haml
+++ b/app/views/refs/blame.html.haml
@@ -4,7 +4,7 @@
%ul.breadcrumb
%li
%span.arrow
- = link_to tree_project_ref_path(@project, @ref, path: nil) do
+ = link_to project_tree_path(@project, @ref) do
= @project.name
- @tree.breadcrumbs(6) do |link|
\/
@@ -20,7 +20,7 @@
%span.options
= link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank"
= link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
- = link_to "source", tree_file_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small"
+ = link_to "source", project_tree_path(@project, tree_join(@ref, params[:path])), class: "btn very_small"
.file_content.blame
%table
- @blame.each do |commit, lines|
diff --git a/app/views/refs/logs_tree.js.haml b/app/views/refs/logs_tree.js.haml
index 61ccbaee1fe..b0ac0c4b0fd 100644
--- a/app/views/refs/logs_tree.js.haml
+++ b/app/views/refs/logs_tree.js.haml
@@ -6,4 +6,4 @@
:plain
var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
row.find("td.tree_time_ago").html('#{escape_javascript(time_ago_in_words(content_commit.committed_date))} ago');
- row.find("td.tree_commit").html('#{escape_javascript(render("tree_commit", tm: tm, content_commit: content_commit))}');
+ row.find("td.tree_commit").html('#{escape_javascript(render("tree/tree_commit", tm: tm, content_commit: content_commit))}');