summaryrefslogtreecommitdiff
path: root/app/helpers/tab_helper.rb
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2015-01-24 11:02:58 -0700
committerVinnie Okada <vokada@mrvinn.com>2015-02-14 11:09:23 -0700
commit76aad9b76ed756ca9ba2cbcdb399c815e542b3ae (patch)
tree7226e0ce64796abbf4848582baed8d173ddecd14 /app/helpers/tab_helper.rb
parent5725b6daad2f403f13112cfcafa5b45ac126c0ca (diff)
downloadgitlab-ce-76aad9b76ed756ca9ba2cbcdb399c815e542b3ae.tar.gz
Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
Diffstat (limited to 'app/helpers/tab_helper.rb')
-rw-r--r--app/helpers/tab_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 2142db29925..7a401a274d3 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -97,7 +97,8 @@ module TabHelper
def branches_tab_class
if current_controller?(:protected_branches) ||
current_controller?(:branches) ||
- current_page?(project_repository_path(@project))
+ current_page?(namespace_project_repository_path(@project.namespace,
+ @project))
'active'
end
end