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.

7 files changed, 8 insertions, 8 deletions

diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index 58bcff9dbe3..796dd752a4c 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -2,7 +2,7 @@
   #{@search_results.total_count} results found
   - unless @show_snippets
     - if @project
-      for #{link_to @project.name_with_namespace, @project}
+      for #{link_to @project.name_with_namespace, [@project.namespace.becomes(Namespace), @project]}
     - elsif @group
       for #{link_to @group.name, @group}
 
diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml
index dae641dab4f..84e9be82c44 100644
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
@@ -1,7 +1,7 @@
 .blob-result
   .file-holder
     .file-title
-      = link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do
+      = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do
         %i.fa.fa-file
         %strong
           = blob.filename
diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml
index 7868f958261..ce8ddff9556 100644
--- a/app/views/search/results/_issue.html.haml
+++ b/app/views/search/results/_issue.html.haml
@@ -1,6 +1,6 @@
 .search-result-row
   %h4
-    = link_to [issue.project, issue] do
+    = link_to [issue.project.namespace.becomes(Namespace), issue.project, issue] do
       %span.term.str-truncated= issue.title
     .pull-right ##{issue.iid}
   - if issue.description.present?
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml
index 56b185283bd..2efa616d664 100644
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@@ -1,6 +1,6 @@
 .search-result-row
   %h4
-    = link_to [merge_request.target_project, merge_request] do
+    = link_to [merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request] do
       %span.term.str-truncated= merge_request.title
     .pull-right ##{merge_request.iid}
   - if merge_request.description.present?
diff --git a/app/views/search/results/_note.html.haml b/app/views/search/results/_note.html.haml
index a44a4542df5..5fcba2b7e93 100644
--- a/app/views/search/results/_note.html.haml
+++ b/app/views/search/results/_note.html.haml
@@ -9,7 +9,7 @@
       = link_to project do
         = project.name_with_namespace
       ·
-      = link_to project_commit_path(project, note.commit_id, anchor: dom_id(note)) do
+      = link_to namespace_project_commit_path(project.namespace, project, note.commit_id, anchor: dom_id(note)) do
         Commit #{truncate_sha(note.commit_id)}
     - else
       = link_to project do
@@ -17,7 +17,7 @@
       ·
       %span #{note.noteable_type.titleize} ##{note.noteable.iid}
       ·
-      = link_to [project, note.noteable, anchor: dom_id(note)]  do
+      = link_to [project.namespace.becomes(Namespace), project, note.noteable, anchor: dom_id(note)]  do
         = note.noteable.title
 
   .note-search-result
diff --git a/app/views/search/results/_project.html.haml b/app/views/search/results/_project.html.haml
index 301b65eca29..195cf06c8ea 100644
--- a/app/views/search/results/_project.html.haml
+++ b/app/views/search/results/_project.html.haml
@@ -1,6 +1,6 @@
 .search-result-row
   %h4
-    = link_to project do
+    = link_to [project.namespace.becomes(Namespace), project] do
       %span.term= project.name_with_namespace
   - if project.description.present?
     %span.light.term= project.description
diff --git a/app/views/search/results/_wiki_blob.html.haml b/app/views/search/results/_wiki_blob.html.haml
index c7bc596eb14..f9c5810e3d0 100644
--- a/app/views/search/results/_wiki_blob.html.haml
+++ b/app/views/search/results/_wiki_blob.html.haml
@@ -1,7 +1,7 @@
 .blob-result
   .file-holder
     .file-title
-      = link_to project_wiki_path(@project, wiki_blob.filename) do
+      = link_to namespace_project_wiki_path(@project.namespace, @project, wiki_blob.filename) do
         %i.fa.fa-file
         %strong
           = wiki_blob.filename