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.

14 files changed, 156 insertions, 62 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e45f4650309..c3c77d9880f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -55,7 +55,7 @@ module ApplicationHelper
     if project.avatar.present?
       image_tag project.avatar.url, options
     elsif project.avatar_in_git
-      image_tag project_avatar_path(project), options
+      image_tag namespace_project_avatar_path(project.namespace, project), options
     else # generated icon
       project_identicon(project, options)
     end
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index e75eebd2da9..f5f27223d5b 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -36,8 +36,12 @@ module BlobHelper
       link_opts[:from_merge_request_id] = from_mr if from_mr
       cls = 'btn btn-small'
       if allowed_tree_edit?(project, ref)
-        link_to text, project_edit_blob_path(project, tree_join(ref, path),
-                                             link_opts), class: cls
+        link_to(text,
+                namespace_project_edit_blob_path(project.namespace, project,
+                                                 tree_join(ref, path),
+                                                 link_opts),
+                class: cls
+               )
       else
         content_tag :span, text, class: cls + ' disabled'
       end + after.html_safe
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index b4ba14160ed..5aae697e2f0 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -37,7 +37,10 @@ module CommitsHelper
 
     # Add the root project link and the arrow icon
     crumbs = content_tag(:li) do
-      link_to(@project.path, project_commits_path(@project, @ref))
+      link_to(
+        @project.path,
+        namespace_project_commits_path(@project.namespace, @project, @ref)
+      )
     end
 
     if @path
@@ -46,7 +49,14 @@ module CommitsHelper
       parts.each_with_index do |part, i|
         crumbs << content_tag(:li) do
           # The text is just the individual part, but the link needs all the parts before it
-          link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
+          link_to(
+            part,
+            namespace_project_commits_path(
+              @project.namespace,
+              @project,
+              tree_join(@ref, parts[0..i].join('/'))
+            )
+          )
         end
       end
     end
@@ -63,7 +73,9 @@ module CommitsHelper
   # Returns the sorted alphabetically links to branches, separated by a comma
   def commit_branches_links(project, branches)
     branches.sort.map do |branch|
-      link_to(project_tree_path(project, branch)) do
+      link_to(
+        namespace_project_tree_path(project.namespace, project, branch)
+      ) do
         content_tag :span, class: 'label label-gray' do
           icon('code-fork') + ' ' + branch
         end
@@ -75,7 +87,10 @@ module CommitsHelper
   def commit_tags_links(project, tags)
     sorted = VersionSorter.rsort(tags)
     sorted.map do |tag|
-      link_to(project_commits_path(project, project.repository.find_tag(tag).name)) do
+      link_to(
+        namespace_project_commits_path(project.namespace, project,
+                                       project.repository.find_tag(tag).name)
+      ) do
         content_tag :span, class: 'label label-gray' do
           icon('tag') + ' ' + tag
         end
@@ -86,12 +101,26 @@ module CommitsHelper
   def link_to_browse_code(project, commit)
     if current_controller?(:projects, :commits)
       if @repo.blob_at(commit.id, @path)
-        return link_to "Browse File »", project_blob_path(project, tree_join(commit.id, @path)), class: "pull-right"
+        return link_to(
+          "Browse File »",
+          namespace_project_blob_path(project.namespace, project,
+                                      tree_join(commit.id, @path)),
+          class: "pull-right"
+        )
       elsif @path.present?
-        return link_to "Browse Dir »", project_tree_path(project, tree_join(commit.id, @path)), class: "pull-right"
+        return link_to(
+          "Browse Dir »",
+          namespace_project_tree_path(project.namespace, project,
+                                      tree_join(commit.id, @path)),
+          class: "pull-right"
+        )
       end
     end
-    link_to "Browse Code »", project_tree_path(project, commit), class: "pull-right"
+    link_to(
+      "Browse Code »",
+      namespace_project_tree_path(project.namespace, project, commit),
+      class: "pull-right"
+    )
   end
 
   protected
@@ -133,8 +162,11 @@ module CommitsHelper
   end
 
   def view_file_btn(commit_sha, diff, project)
-    link_to project_blob_path(project, tree_join(commit_sha, diff.new_path)),
-            class: 'btn btn-small view-file js-view-file' do
+    link_to(
+      namespace_project_blob_path(project.namespace, project,
+                                  tree_join(commit_sha, diff.new_path)),
+      class: 'btn btn-small view-file js-view-file'
+    ) do
       raw('View file @') + content_tag(:span, commit_sha[0..6],
                                        class: 'commit-short-id')
     end
diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb
index dd2e713a54e..01847c6b807 100644
--- a/app/helpers/compare_helper.rb
+++ b/app/helpers/compare_helper.rb
@@ -10,6 +10,13 @@ module CompareHelper
   end
 
   def compare_mr_path
-    new_project_merge_request_path(@project, merge_request: { source_branch: params[:to], target_branch: params[:from] })
+    new_namespace_project_merge_request_path(
+      @project.namespace,
+      @project,
+      merge_request: {
+        source_branch: params[:to],
+        target_branch: params[:from]
+      }
+    )
   end
 end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index d05f6df5f9f..6e7aa521302 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -61,17 +61,23 @@ module EventsHelper
 
   def event_feed_url(event)
     if event.issue?
-      project_issue_url(event.project, event.issue)
+      namespace_project_issue_url(event.project.namespace, event.project,
+                                  event.issue)
     elsif event.merge_request?
-      project_merge_request_url(event.project, event.merge_request)
+      namespace_project_merge_request_url(event.project.namespace,
+                                          event.project, event.merge_request)
     elsif event.note? && event.note_commit?
-      project_commit_url(event.project, event.note_target)
+      namespace_project_commit_url(event.project.namespace, event.project,
+                                   event.note_target)
     elsif event.note?
       if event.note_target
         if event.note_commit?
-          project_commit_path(event.project, event.note_commit_id, anchor: dom_id(event.target))
+          namespace_project_commit_path(event.project.namespace, event.project,
+                                        event.note_commit_id,
+                                        anchor: dom_id(event.target))
         elsif event.note_project_snippet?
-          project_snippet_path(event.project, event.note_target)
+          namespace_project_snippet_path(event.project.namespace,
+                                         event.project, event.note_target)
         else
           event_note_target_path(event)
         end
@@ -79,12 +85,16 @@ module EventsHelper
     elsif event.push?
       if event.push_with_commits?
         if event.commits_count > 1
-          project_compare_url(event.project, from: event.commit_from, to: event.commit_to)
+          namespace_project_compare_url(event.project.namespace, event.project,
+                                        from: event.commit_from, to:
+                                        event.commit_to)
         else
-          project_commit_url(event.project, id: event.commit_to)
+          namespace_project_commit_url(event.project.namespace, event.project,
+                                       id: event.commit_to)
         end
       else
-        project_commits_url(event.project, event.ref_name)
+        namespace_project_commits_url(event.project.namespace, event.project,
+                                      event.ref_name)
       end
     end
   end
@@ -105,20 +115,30 @@ module EventsHelper
 
   def event_note_target_path(event)
     if event.note? && event.note_commit?
-      project_commit_path(event.project, event.note_target)
+      namespace_project_commit_path(event.project.namespace, event.project,
+                                    event.note_target)
     else
-      polymorphic_path([event.project, event.note_target], anchor: dom_id(event.target))
+      polymorphic_path([event.project.namespace.becomes(Namespace),
+                        event.project, event.note_target],
+                       anchor: dom_id(event.target))
     end
   end
 
   def event_note_title_html(event)
     if event.note_target
       if event.note_commit?
-        link_to project_commit_path(event.project, event.note_commit_id, anchor: dom_id(event.target)), class: "commit_short_id" do
+        link_to(
+          namespace_project_commit_path(event.project.namespace, event.project,
+                                        event.note_commit_id,
+                                        anchor: dom_id(event.target)),
+          class: "commit_short_id"
+        ) do
           "#{event.note_target_type} #{event.note_short_commit_id}"
         end
       elsif event.note_project_snippet?
-        link_to(project_snippet_path(event.project, event.note_target)) do
+        link_to(namespace_project_snippet_path(event.project.namespace,
+                                               event.project,
+                                               event.note_target)) do
           "#{event.note_target_type} ##{truncate event.note_target_id}"
         end
       else
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index e1c1078344e..15c5dcb6a25 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -93,8 +93,10 @@ module IssuesHelper
 
   def issue_to_atom(xml, issue)
     xml.entry do
-      xml.id      project_issue_url(issue.project, issue)
-      xml.link    href: project_issue_url(issue.project, issue)
+      xml.id      namespace_project_issue_url(issue.project.namespace,
+                                              issue.project, issue)
+      xml.link    href: namespace_project_issue_url(issue.project.namespace,
+                                                    issue.project, issue)
       xml.title   truncate(issue.title, length: 80)
       xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
       xml.media   :thumbnail, width: "40", height: "40", url: avatar_icon(issue.author_email)
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 4c640d4fc5f..3b1589da57f 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -1,14 +1,16 @@
 module MergeRequestsHelper
   def new_mr_path_from_push_event(event)
     target_project = event.project.forked_from_project || event.project
-    new_project_merge_request_path(
+    new_namespace_project_merge_request_path(
+      event.project.namespace,
       event.project,
       new_mr_from_push_event(event, target_project)
     )
   end
 
   def new_mr_path_for_fork_from_push_event(event)
-    new_project_merge_request_path(
+    new_namespace_project_merge_request_path(
+      event.project.namespace,
       event.project,
       new_mr_from_push_event(event, event.project.forked_from_project)
     )
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 6847123d2d4..47fa147dccf 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -1,7 +1,7 @@
 module MilestonesHelper
   def milestones_filter_path(opts = {})
     if @project
-      project_milestones_path(@project, opts)
+      namespace_project_milestones_path(@project.namespace, @project, opts)
     elsif @group
       group_milestones_path(@group, opts)
     end
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 8edcb8e6a80..92ecb2abe4d 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -11,7 +11,11 @@ module NotesHelper
 
   def link_to_commit_diff_line_note(note)
     if note.for_commit_diff_line?
-      link_to "#{note.diff_file_name}:L#{note.diff_new_line}", project_commit_path(@project, note.noteable, anchor: note.line_code)
+      link_to(
+        "#{note.diff_file_name}:L#{note.diff_new_line}",
+        namespace_project_commit_path(@project.namespace, @project,
+                                      note.noteable, anchor: note.line_code)
+      )
     end
   end
 
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 36463892ebf..900afde4d9b 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -4,7 +4,7 @@ module ProjectsHelper
   end
 
   def link_to_project(project)
-    link_to project do
+    link_to [project.namespace.becomes(Namespace), project] do
       title = content_tag(:span, project.name, class: 'project-name')
 
       if project.namespace
@@ -42,12 +42,20 @@ module ProjectsHelper
   def project_title(project)
     if project.group
       content_tag :span do
-        link_to(simple_sanitize(project.group.name), group_path(project.group)) + ' / ' + link_to(simple_sanitize(project.name), project_path(project))
+        link_to(
+          simple_sanitize(project.group.name), group_path(project.group)
+        ) + ' / ' +
+          link_to(simple_sanitize(project.name),
+                  namespace_project_path(project.namespace, project))
       end
     else
       owner = project.namespace.owner
       content_tag :span do
-        link_to(simple_sanitize(owner.name), user_path(owner)) + ' / ' + link_to(simple_sanitize(project.name), project_path(project))
+        link_to(
+          simple_sanitize(owner.name), user_path(owner)
+        ) + ' / ' +
+          link_to(simple_sanitize(project.name),
+                  namespace_project_path(project.namespace, project))
       end
     end
   end
@@ -100,7 +108,10 @@ module ProjectsHelper
 
 
     content_tag 'span', class: starred ? 'turn-on' : 'turn-off' do
-      link_to toggle_star_project_path(@project), link_opts do
+      link_to(
+        toggle_star_namespace_project_path(@project.namespace, @project),
+        link_opts
+      ) do
         toggle_html + ' ' + count_html
       end
     end
@@ -222,7 +233,12 @@ module ProjectsHelper
 
   def contribution_guide_url(project)
     if project && project.repository.contribution_guide
-      project_blob_path(project, tree_join(project.default_branch, project.repository.contribution_guide.name))
+      namespace_project_blob_path(
+        project.namespace,
+        project,
+        tree_join(project.default_branch,
+                  project.repository.contribution_guide.name)
+      )
     end
   end
 
@@ -236,7 +252,7 @@ module ProjectsHelper
 
   def project_wiki_path_with_version(proj, page, version, is_newest)
     url_params = is_newest ? {} : { version_id: version }
-    project_wiki_path(proj, page, url_params)
+    namespace_project_wiki_path(proj.namespace, proj, page, url_params)
   end
 
   def project_status_css_class(status)
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 65b9408cfa1..cb829037697 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -52,16 +52,16 @@ module SearchHelper
       ref    = @ref || @project.repository.root_ref
 
       [
-        { label: "#{prefix} - Files",          url: project_tree_path(@project, ref) },
-        { label: "#{prefix} - Commits",        url: project_commits_path(@project, ref) },
-        { label: "#{prefix} - Network",        url: project_network_path(@project, ref) },
-        { label: "#{prefix} - Graph",          url: project_graph_path(@project, ref) },
-        { label: "#{prefix} - Issues",         url: project_issues_path(@project) },
-        { label: "#{prefix} - Merge Requests", url: project_merge_requests_path(@project) },
-        { label: "#{prefix} - Milestones",     url: project_milestones_path(@project) },
-        { label: "#{prefix} - Snippets",       url: project_snippets_path(@project) },
-        { label: "#{prefix} - Team",           url: project_team_index_path(@project) },
-        { label: "#{prefix} - Wiki",           url: project_wikis_path(@project) },
+        { label: "#{prefix} - Files",          url: namespace_project_tree_path(@project.namespace, @project, ref) },
+        { label: "#{prefix} - Commits",        url: namespace_project_commits_path(@project.namespace, @project, ref) },
+        { label: "#{prefix} - Network",        url: namespace_project_network_path(@project.namespace, @project, ref) },
+        { label: "#{prefix} - Graph",          url: namespace_project_graph_path(@project.namespace, @project, ref) },
+        { label: "#{prefix} - Issues",         url: namespace_project_issues_path(@project.namespace, @project) },
+        { label: "#{prefix} - Merge Requests", url: namespace_project_merge_requests_path(@project.namespace, @project) },
+        { label: "#{prefix} - Milestones",     url: namespace_project_milestones_path(@project.namespace, @project) },
+        { label: "#{prefix} - Snippets",       url: namespace_project_snippets_path(@project.namespace, @project) },
+        { label: "#{prefix} - Team",           url: namespace_project_team_index_path(@project.namespace, @project) },
+        { label: "#{prefix} - Wiki",           url: namespace_project_wikis_path(@project.namespace, @project) },
       ]
     else
       []
@@ -84,7 +84,7 @@ module SearchHelper
       sorted_by_stars.non_archived.limit(limit).map do |p|
       {
         label: "project: #{search_result_sanitize(p.name_with_namespace)}",
-        url: project_path(p)
+        url: namespace_project_path(p.namespace, p)
       }
     end
   end
diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb
index b0abc2cae33..906cb12cd48 100644
--- a/app/helpers/snippets_helper.rb
+++ b/app/helpers/snippets_helper.rb
@@ -11,7 +11,8 @@ module SnippetsHelper
 
   def reliable_snippet_path(snippet)
     if snippet.project_id?
-      project_snippet_path(snippet.project, snippet)
+      namespace_project_snippet_path(snippet.project.namespace,
+                                     snippet.project, snippet)
     else
       snippet_path(snippet)
     end
diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb
index 841e7fd17f6..525266fb3b5 100644
--- a/app/helpers/submodule_helper.rb
+++ b/app/helpers/submodule_helper.rb
@@ -5,19 +5,22 @@ module SubmoduleHelper
   def submodule_links(submodule_item, ref = nil)
     url = @repository.submodule_url_for(ref, submodule_item.path)
 
-    return url, nil unless url =~ /([^\/:]+\/[^\/]+\.git)\Z/
+    return url, nil unless url =~ /([^\/:]+)\/([^\/]+\.git)\Z/
 
-    project = $1
+    namespace = $1
+    project = $2
     project.chomp!('.git')
 
-    if self_url?(url, project)
-      return project_path(project), project_tree_path(project, submodule_item.id)
+    if self_url?(url, namespace, project)
+      return namespace_project_path(namespace, project),
+        namespace_project_tree_path(namespace, project,
+                                    submodule_item.id)
     elsif relative_self_url?(url)
       relative_self_links(url, submodule_item.id)
     elsif github_dot_com_url?(url)
-      standard_links('github.com', project, submodule_item.id)
+      standard_links('github.com', namespace, project, submodule_item.id)
     elsif gitlab_dot_com_url?(url)
-      standard_links('gitlab.com', project, submodule_item.id)
+      standard_links('gitlab.com', namespace, project, submodule_item.id)
     else
       return url, nil
     end
@@ -33,9 +36,10 @@ module SubmoduleHelper
     url =~ /gitlab\.com[\/:][^\/]+\/[^\/]+\Z/
   end
 
-  def self_url?(url, project)
-    return true if url == [ Gitlab.config.gitlab.url, '/', project, '.git' ].join('')
-    url == gitlab_shell.url_to_repo(project)
+  def self_url?(url, namespace, project)
+    return true if url == [ Gitlab.config.gitlab.url, '/', namespace, '/',
+                            project, '.git' ].join('')
+    url == gitlab_shell.url_to_repo([namespace, '/', project].join(''))
   end
 
   def relative_self_url?(url)
@@ -43,8 +47,8 @@ module SubmoduleHelper
     url =~ /^((\.\/)?(\.\.\/))(?!(\.\.)|(.*\/)).*\.git\Z/ || url =~ /^((\.\/)?(\.\.\/){2})(?!(\.\.))([^\/]*)\/(?!(\.\.)|(.*\/)).*\.git\Z/
   end
 
-  def standard_links(host, project, commit)
-    base = [ 'https://', host, '/', project ].join('')
+  def standard_links(host, namespace, project, commit)
+    base = [ 'https://', host, '/', namespace, '/', project ].join('')
     return base, [ base, '/tree/', commit ].join('')
   end
 
@@ -54,6 +58,7 @@ module SubmoduleHelper
     else
       base = [ @project.group.path, '/', url[/([^\/]*)\.git/, 1] ].join('')
     end
-    return project_path(base), project_tree_path(base, commit)
+    return namespace_project_path(base.namespace, base),
+      namespace_project_tree_path(base.namespace, base, commit)
   end
 end
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