Fix paths in commits/_head

Robert Speicher
1 parent 0887dda8
Showing 1 changed file with 3 additions and 3 deletions Show diff stats
app/views/commits/_head.html.haml
 %ul.nav.nav-tabs
   %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
-  %li{class: "#{'active' if current_page?(project_commits_path(@project)) }"}
-    = link_to project_commits_path(@project) do
+  %li{class: "#{'active' if current_controller?(:commit, :commits)}"}
+    = link_to project_commits_path(@project, @project.root_ref) do
       Commits
   %li{class: "#{'active' if current_controller?(:compare)}"}
     = link_to project_compare_index_path(@project) do
@@ -16,7 +16,7 @@
       Tags
       %span.badge= @project.repo.tag_count
  
-  - if current_page?(project_commits_path(@project)) && current_user.private_token
+  - if current_controller?(:commits) && current_user.private_token
     %li.right
       %span.rss-icon
         = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
1	1	%ul.nav.nav-tabs
2	2	%li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
3		- %li{class: "#{'active' if current_page?(project_commits_path(@project)) }"}
4		- = link_to project_commits_path(@project) do
	3	+ %li{class: "#{'active' if current_controller?(:commit, :commits)}"}
	4	+ = link_to project_commits_path(@project, @project.root_ref) do
5	5	Commits
6	6	%li{class: "#{'active' if current_controller?(:compare)}"}
7	7	= link_to project_compare_index_path(@project) do
...	...	@@ -16,7 +16,7 @@
16	16	Tags
17	17	%span.badge= @project.repo.tag_count
18	18
19		- - if current_page?(project_commits_path(@project)) && current_user.private_token
	19	+ - if current_controller?(:commits) && current_user.private_token
20	20	%li.right
21	21	%span.rss-icon
22	22	= link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
...	...