Create and use project path helpers that only need a project, no namespace

app/helpers/environments_helper.rb

 module EnvironmentsHelper
   def environments_list_data
     {
-      endpoint: namespace_project_environments_path(@project.namespace, @project, format: :json)
+      endpoint: project_environments_path(@project, format: :json)
     }
   end
 end

app/helpers/events_helper.rb

@@ -99,13 +99,12 @@ module EventsHelper
   def event_feed_url(event)
     if event.issue?
-      namespace_project_issue_url(event.project.namespace, event.project,
+      project_issue_url(event.project,
                                   event.issue)
     elsif event.merge_request?
-      namespace_project_merge_request_url(event.project.namespace,
-                                          event.project, event.merge_request)
+      project_merge_request_url(event.project, event.merge_request)
     elsif event.commit_note?
-      namespace_project_commit_url(event.project.namespace, event.project,
+      project_commit_url(event.project,
                                    event.note_target)
     elsif event.note?
       if event.note_target
@@ -119,15 +118,15 @@ module EventsHelper
   def push_event_feed_url(event)
     if event.push_with_commits? && event.md_ref?
       if event.commits_count > 1
-        namespace_project_compare_url(event.project.namespace, event.project,
+        project_compare_url(event.project,
                                       from: event.commit_from, to:
                                       event.commit_to)
       else
-        namespace_project_commit_url(event.project.namespace, event.project,
+        project_commit_url(event.project,
                                      id: event.commit_to)
       end
     else
-      namespace_project_commits_url(event.project.namespace, event.project,
+      project_commits_url(event.project,
                                     event.ref_name)
     end
   end
@@ -146,15 +145,9 @@ module EventsHelper
   def event_note_target_path(event)
     if event.commit_note?
-      namespace_project_commit_path(event.project.namespace,
-                                    event.project,
-                                    event.note_target,
-                                    anchor: dom_id(event.target))
+      project_commit_path(event.project, event.note_target, anchor: dom_id(event.target))
     elsif event.project_snippet_note?
-      namespace_project_snippet_path(event.project.namespace,
-                                     event.project,
-                                     event.note_target,
-                                     anchor: dom_id(event.target))
+      project_snippet_path(event.project, event.note_target, anchor: dom_id(event.target))
     else
       polymorphic_path([event.project.namespace.becomes(Namespace),
                         event.project, event.note_target],

app/helpers/external_wiki_helper.rb

@@ -4,7 +4,7 @@ module ExternalWikiHelper
     if external_wiki_service
       external_wiki_service.properties['external_wiki_url']
     else
-      namespace_project_wiki_path(project.namespace, project, :home)
+      project_wiki_path(project, :home)
     end
   end
 end

app/helpers/gitlab_routing_helper.rb

-# Shorter routing method for project and project items
-# Since update to rails 4.1.9 we are now allowed to use `/` in project routing
-# so we use nested routing for project resources which include project and
-# project namespace. To avoid writing long methods every time we define shortcuts for
-# some of routing.
-#
-# For example instead of this:
-#
-#   namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
-#
-# We can simply use shortcut:
-#
-#   merge_request_path(merge_request)
-#
+# Shorter routing method for some project items
 module GitlabRoutingHelper
-  # Project
-  def project_path(project, *args)
-    namespace_project_path(project.namespace, project, *args)
-  end
-
-  def project_url(project, *args)
-    namespace_project_url(project.namespace, project, *args)
-  end
-
-  def edit_project_path(project, *args)
-    edit_namespace_project_path(project.namespace, project, *args)
-  end
-
-  def edit_project_url(project, *args)
-    edit_namespace_project_url(project.namespace, project, *args)
-  end
-
-  def project_files_path(project, *args)
-    namespace_project_tree_path(project.namespace, project, @ref || project.repository.root_ref)
-  end
-
-  def project_commits_path(project, *args)
-    namespace_project_commits_path(project.namespace, project, @ref || project.repository.root_ref)
-  end
-
-  def project_pipelines_path(project, *args)
-    namespace_project_pipelines_path(project.namespace, project, *args)
-  end
-
-  def project_environments_path(project, *args)
-    namespace_project_environments_path(project.namespace, project, *args)
-  end
-  def project_cycle_analytics_path(project, *args)
-    namespace_project_cycle_analytics_path(project.namespace, project, *args)
+  extend ActiveSupport::Concern
+  # Project
+  def project_tree_path(project, ref = nil, *args)
+    namespace_project_tree_path(project.namespace, project, ref || @ref || project.repository.root_ref, *args) # rubocop:disable Cop/ProjectPathHelper
   end
-  def project_jobs_path(project, *args)
-    namespace_project_jobs_path(project.namespace, project, *args)
+  def project_commits_path(project, ref = nil, *args)
+    namespace_project_commits_path(project.namespace, project, ref || @ref || project.repository.root_ref, *args) # rubocop:disable Cop/ProjectPathHelper
   end
   def project_ref_path(project, ref_name, *args)
-    namespace_project_commits_path(project.namespace, project, ref_name, *args)
-  end
-
-  def project_container_registry_path(project, *args)
-    namespace_project_container_registry_index_path(project.namespace, project, *args)
-  end
-
-  def activity_project_path(project, *args)
-    activity_namespace_project_path(project.namespace, project, *args)
+    project_commits_path(project, ref_name, *args)
   end
   def runners_path(project, *args)
-    namespace_project_runners_path(project.namespace, project, *args)
+    project_runners_path(project, *args)
   end
   def runner_path(runner, *args)
-    namespace_project_runner_path(@project.namespace, @project, runner, *args)
+    project_runner_path(@project, runner, *args)
   end
   def environment_path(environment, *args)
-    namespace_project_environment_path(environment.project.namespace, environment.project, environment, *args)
+    project_environment_path(environment.project, environment, *args)
   end
   def environment_metrics_path(environment, *args)
-    metrics_namespace_project_environment_path(environment.project.namespace, environment.project, environment, *args)
+    metrics_project_environment_path(environment.project, environment, *args)
   end
   def issue_path(entity, *args)
-    namespace_project_issue_path(entity.project.namespace, entity.project, entity, *args)
+    project_issue_path(entity.project, entity, *args)
   end
   def merge_request_path(entity, *args)
-    namespace_project_merge_request_path(entity.project.namespace, entity.project, entity, *args)
+    project_merge_request_path(entity.project, entity, *args)
   end
   def pipeline_path(pipeline, *args)
-    namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, *args)
+    project_pipeline_path(pipeline.project, pipeline.id, *args)
   end
   def milestone_path(entity, *args)
-    namespace_project_milestone_path(entity.project.namespace, entity.project, entity, *args)
+    project_milestone_path(entity.project, entity, *args)
   end
   def issue_url(entity, *args)
-    namespace_project_issue_url(entity.project.namespace, entity.project, entity, *args)
+    project_issue_url(entity.project, entity, *args)
   end
   def merge_request_url(entity, *args)
-    namespace_project_merge_request_url(entity.project.namespace, entity.project, entity, *args)
+    project_merge_request_url(entity.project, entity, *args)
   end
   def pipeline_url(pipeline, *args)
-    namespace_project_pipeline_url(pipeline.project.namespace, pipeline.project, pipeline.id, *args)
+    project_pipeline_url(pipeline.project, pipeline.id, *args)
   end
   def pipeline_job_url(pipeline, build, *args)
-    namespace_project_job_url(pipeline.project.namespace, pipeline.project, build.id, *args)
+    project_job_url(pipeline.project, build.id, *args)
   end
   def commits_url(entity, *args)
-    namespace_project_commits_url(entity.project.namespace, entity.project, entity.ref, *args)
+    project_commits_url(entity.project, entity.ref, *args)
   end
   def commit_url(entity, *args)
-    namespace_project_commit_url(entity.project.namespace, entity.project, entity.sha, *args)
-  end
-
-  def project_snippet_url(entity, *args)
-    namespace_project_snippet_url(entity.project.namespace, entity.project, entity, *args)
+    project_commit_url(entity.project, entity.sha, *args)
   end
   def preview_markdown_path(project, *args)
     if @snippet.is_a?(PersonalSnippet)
       preview_markdown_snippets_path
     else
-      preview_markdown_namespace_project_path(project.namespace, project, *args)
+      preview_markdown_project_path(project, *args)
     end
   end
   def toggle_subscription_path(entity, *args)
     if entity.is_a?(Issue)
-      toggle_subscription_namespace_project_issue_path(entity.project.namespace, entity.project, entity)
+      toggle_subscription_project_issue_path(entity.project, entity)
     else
-      toggle_subscription_namespace_project_merge_request_path(entity.project.namespace, entity.project, entity)
+      toggle_subscription_project_merge_request_path(entity.project, entity)
     end
   end
@@ -152,32 +97,27 @@ module GitlabRoutingHelper
   ## Members
   def project_members_url(project, *args)
-    namespace_project_project_members_url(project.namespace, project)
+    project_project_members_url(project)
   end
   def project_member_path(project_member, *args)
-    namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
+    project_project_member_path(project_member.source, project_member)
   end
   def request_access_project_members_path(project, *args)
-    request_access_namespace_project_project_members_path(project.namespace, project)
+    request_access_project_project_members_path(project)
   end
   def leave_project_members_path(project, *args)
-    leave_namespace_project_project_members_path(project.namespace, project)
+    leave_project_project_members_path(project)
   end
   def approve_access_request_project_member_path(project_member, *args)
-    approve_access_request_namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
+    approve_access_request_project_project_member_path(project_member.source, project_member)
   end
   def resend_invite_project_member_path(project_member, *args)
-    resend_invite_namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
-  end
-
-  # Snippets
-  def personal_snippet_url(snippet, *args)
-    snippet_url(snippet)
+    resend_invite_project_project_member_path(project_member.source, project_member)
   end
   # Groups
@@ -211,50 +151,37 @@ module GitlabRoutingHelper
   def artifacts_action_path(path, project, build)
     action, path_params = path.split('/', 2)
-    args = [project.namespace, project, build, path_params]
+    args = [project, build, path_params]
     case action
     when 'download'
-      download_namespace_project_job_artifacts_path(*args)
+      download_project_job_artifacts_path(*args)
     when 'browse'
-      browse_namespace_project_job_artifacts_path(*args)
+      browse_project_job_artifacts_path(*args)
     when 'file'
-      file_namespace_project_job_artifacts_path(*args)
+      file_project_job_artifacts_path(*args)
     when 'raw'
-      raw_namespace_project_job_artifacts_path(*args)
+      raw_project_job_artifacts_path(*args)
     end
   end
   # Pipeline Schedules
   def pipeline_schedules_path(project, *args)
-    namespace_project_pipeline_schedules_path(project.namespace, project, *args)
+    project_pipeline_schedules_path(project, *args)
   end
   def pipeline_schedule_path(schedule, *args)
     project = schedule.project
-    namespace_project_pipeline_schedule_path(project.namespace, project, schedule, *args)
+    project_pipeline_schedule_path(project, schedule, *args)
   end
   def edit_pipeline_schedule_path(schedule)
     project = schedule.project
-    edit_namespace_project_pipeline_schedule_path(project.namespace, project, schedule)
+    edit_project_pipeline_schedule_path(project, schedule)
   end
   def take_ownership_pipeline_schedule_path(schedule, *args)
     project = schedule.project
-    take_ownership_namespace_project_pipeline_schedule_path(project.namespace, project, schedule, *args)
-  end
-
-  # Settings
-  def project_settings_integrations_path(project, *args)
-    namespace_project_settings_integrations_path(project.namespace, project, *args)
-  end
-
-  def project_settings_members_path(project, *args)
-    namespace_project_settings_members_path(project.namespace, project, *args)
-  end
-
-  def project_settings_ci_cd_path(project, *args)
-    namespace_project_settings_ci_cd_path(project.namespace, project, *args)
+    take_ownership_project_pipeline_schedule_path(project, schedule, *args)
   end
 end

app/helpers/issuables_helper.rb

@@ -26,9 +26,9 @@ module IssuablesHelper
     project = issuable.project
     if issuable.is_a?(MergeRequest)
-      namespace_project_merge_request_path(project.namespace, project, issuable.iid, :json)
+      project_merge_request_path(project, issuable.iid, :json)
     else
-      namespace_project_issue_path(project.namespace, project, issuable.iid, :json)
+      project_issue_path(project, issuable.iid, :json)
     end
   end
@@ -197,7 +197,7 @@ module IssuablesHelper
   def issuable_initial_data(issuable)
     data = {
-      endpoint: namespace_project_issue_path(@project.namespace, @project, issuable),
+      endpoint: project_issue_path(@project, issuable),
       canUpdate: can?(current_user, :update_issue, issuable),
       canDestroy: can?(current_user, :destroy_issue, issuable),
       canMove: current_user ? issuable.can_move?(current_user) : false,
@@ -295,7 +295,7 @@ module IssuablesHelper
       mark_icon: (is_collapsed ? icon('check-square', class: 'todo-undone') : nil),
       issuable_id: issuable.id,
       issuable_type: issuable.class.name.underscore,
-      url: namespace_project_todos_path(@project.namespace, @project),
+      url: project_todos_path(@project),
       delete_path: (dashboard_todo_path(todo) if todo),
       placement: (is_collapsed ? 'left' : nil),
       container: (is_collapsed ? 'body' : nil)

app/helpers/issues_helper.rb

@@ -150,7 +150,7 @@ module IssuesHelper
              Gitlab::UrlBuilder.build(single_discussion.first_note)
            else
              project = merge_request.project
-             namespace_project_merge_request_path(project.namespace, project, merge_request)
+             project_merge_request_path(project, merge_request)
            end
     link_to link_text, path

app/helpers/labels_helper.rb

@@ -57,14 +57,14 @@ module LabelsHelper
   def edit_label_path(label)
     case label
     when GroupLabel then edit_group_label_path(label.group, label)
-    when ProjectLabel then edit_namespace_project_label_path(label.project.namespace, label.project, label)
+    when ProjectLabel then edit_project_label_path(label.project, label)
     end
   end
   def destroy_label_path(label)
     case label
     when GroupLabel then group_label_path(label.group, label)
-    when ProjectLabel then namespace_project_label_path(label.project.namespace, label.project, label)
+    when ProjectLabel then project_label_path(label.project, label)
     end
   end
@@ -127,7 +127,7 @@ module LabelsHelper
     project = @target_project || @project
     if project
-      namespace_project_labels_path(project.namespace, project, :json)
+      project_labels_path(project, :json)
     else
       dashboard_labels_path(:json)
     end
@@ -149,8 +149,8 @@ module LabelsHelper
     case label_subscription_status(label, project)
     when 'group-level' then toggle_subscription_group_label_path(label.group, label)
-    when 'project-level' then toggle_subscription_namespace_project_label_path(project.namespace, project, label)
-    when 'unsubscribed' then toggle_subscription_namespace_project_label_path(project.namespace, project, label)
+    when 'project-level' then toggle_subscription_project_label_path(project, label)
+    when 'unsubscribed' then toggle_subscription_project_label_path(project, label)
     end
   end

app/helpers/merge_requests_helper.rb

 module MergeRequestsHelper
   def new_mr_path_from_push_event(event)
     target_project = event.project.default_merge_request_target
-    namespace_project_new_merge_request_path(
-      event.project.namespace,
+    project_new_merge_request_path(
       event.project,
       new_mr_from_push_event(event, target_project)
     )
@@ -48,8 +47,8 @@ module MergeRequestsHelper
   end
   def mr_change_branches_path(merge_request)
-    namespace_project_new_merge_request_path(
-      @project.namespace, @project,
+    project_new_merge_request_path(
+      @project,
       merge_request: {
         source_project_id: merge_request.source_project_id,
         target_project_id: merge_request.target_project_id,
@@ -82,9 +81,7 @@ module MergeRequestsHelper
   end
   def merge_request_version_path(project, merge_request, merge_request_diff, start_sha = nil)
-    diffs_namespace_project_merge_request_path(
-      project.namespace, project, merge_request,
-      diff_id: merge_request_diff.id, start_sha: start_sha)
+    diffs_project_merge_request_path(project, merge_request, diff_id: merge_request_diff.id, start_sha: start_sha)
   end
   def version_index(merge_request_diff)

app/helpers/milestones_helper.rb

 module MilestonesHelper
   def milestones_filter_path(opts = {})
     if @project
-      namespace_project_milestones_path(@project.namespace, @project, opts)
+      project_milestones_path(@project, opts)
     elsif @group
       group_milestones_path(@group, opts)
     else
@@ -11,7 +11,7 @@ module MilestonesHelper
   def milestones_label_path(opts = {})
     if @project
-      namespace_project_issues_path(@project.namespace, @project, opts)
+      project_issues_path(@project, opts)
     elsif @group
       issues_group_path(@group, opts)
     else
@@ -73,7 +73,7 @@ module MilestonesHelper
   def milestones_filter_dropdown_path
     project = @target_project || @project
     if project
-      namespace_project_milestones_path(project.namespace, project, :json)
+      project_milestones_path(project, :json)
     elsif @group
       group_milestones_path(@group, :json)
     else
@@ -120,7 +120,7 @@ module MilestonesHelper
   def milestone_merge_request_tab_path(milestone)
     if @project
-      merge_requests_namespace_project_milestone_path(@project.namespace, @project, milestone, format: :json)
+      merge_requests_project_milestone_path(@project, milestone, format: :json)
     elsif @group
       merge_requests_group_milestone_path(@group, milestone.safe_title, title: milestone.title, format: :json)
     else
@@ -130,7 +130,7 @@ module MilestonesHelper
   def milestone_participants_tab_path(milestone)
     if @project
-      participants_namespace_project_milestone_path(@project.namespace, @project, milestone, format: :json)
+      participants_project_milestone_path(@project, milestone, format: :json)
     elsif @group
       participants_group_milestone_path(@group, milestone.safe_title, title: milestone.title, format: :json)
     else
@@ -140,7 +140,7 @@ module MilestonesHelper
   def milestone_labels_tab_path(milestone)
     if @project
-      labels_namespace_project_milestone_path(@project.namespace, @project, milestone, format: :json)
+      labels_project_milestone_path(@project, milestone, format: :json)
     elsif @group
       labels_group_milestone_path(@group, milestone.safe_title, title: milestone.title, format: :json)
     else

app/helpers/notes_helper.rb

@@ -81,11 +81,11 @@ module NotesHelper
       path_params = version_params.merge(anchor: discussion.line_code)
-      diffs_namespace_project_merge_request_path(discussion.project.namespace, discussion.project, discussion.noteable, path_params)
+      diffs_project_merge_request_path(discussion.project, discussion.noteable, path_params)
     elsif discussion.for_commit?
       anchor = discussion.line_code if discussion.diff_discussion?
-      namespace_project_commit_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: anchor)
+      project_commit_path(discussion.project, discussion.noteable, anchor: anchor)
     end
   end
@@ -93,12 +93,7 @@ module NotesHelper
     if @snippet.is_a?(PersonalSnippet)
       snippet_notes_path(@snippet)
     else
-      namespace_project_noteable_notes_path(
-        namespace_id: @project.namespace,
-        project_id: @project,
-        target_id: @noteable.id,
-        target_type: @noteable.class.name.underscore
-      )
+      project_noteable_notes_path(@project, target_id: @noteable.id, target_type: @noteable.class.name.underscore)
     end
   end
@@ -106,7 +101,7 @@ module NotesHelper
     if note.noteable.is_a?(PersonalSnippet)
       snippet_note_path(note.noteable, note)
     else
-      namespace_project_note_path(project.namespace, project, note)
+      project_note_path(project, note)
     end
   end

app/helpers/projects_helper.rb

@@ -347,8 +347,7 @@ module ProjectsHelper
   def add_special_file_path(project, file_name:, commit_message: nil, branch_name: nil, context: nil)
     commit_message ||= s_("CommitMessage|Add %{file_name}") % { file_name: file_name.downcase }
-    namespace_project_new_blob_path(
-      project.namespace,
+    project_new_blob_path(
       project,
       project.default_branch || 'master',
       file_name:      file_name,
@@ -359,8 +358,7 @@ module ProjectsHelper
   end
   def add_koding_stack_path(project)
-    namespace_project_new_blob_path(
-      project.namespace,
+    project_new_blob_path(
       project,
       project.default_branch || 'master',
       file_name:      '.koding.yml',
@@ -414,8 +412,7 @@ module ProjectsHelper
   def contribution_guide_path(project)
     if project && contribution_guide = project.repository.contribution_guide
-      namespace_project_blob_path(
-        project.namespace,
+      project_blob_path(
         project,
         tree_join(project.default_branch,
                   contribution_guide.name)
@@ -445,7 +442,7 @@ module ProjectsHelper
   def project_wiki_path_with_version(proj, page, version, is_newest)
     url_params = is_newest ? {} : { version_id: version }
-    namespace_project_wiki_path(proj.namespace, proj, page, url_params)
+    project_wiki_path(proj, page, url_params)
   end
   def project_status_css_class(status)
@@ -470,8 +467,7 @@ module ProjectsHelper
   def filename_path(project, filename)
     if project && blob = project.repository.send(filename)
-      namespace_project_blob_path(
-        project.namespace,
+      project_blob_path(
         project,
         tree_join(project.default_branch, blob.name)
       )

app/helpers/search_helper.rb

@@ -67,16 +67,16 @@ module SearchHelper
       ref = @ref || @project.repository.root_ref
       [
-        { category: "Current Project", label: "Files",          url: namespace_project_tree_path(@project.namespace, @project, ref) },
-        { category: "Current Project", label: "Commits",        url: namespace_project_commits_path(@project.namespace, @project, ref) },
-        { category: "Current Project", label: "Network",        url: namespace_project_network_path(@project.namespace, @project, ref) },
-        { category: "Current Project", label: "Graph",          url: namespace_project_graph_path(@project.namespace, @project, ref) },
-        { category: "Current Project", label: "Issues",         url: namespace_project_issues_path(@project.namespace, @project) },
-        { category: "Current Project", label: "Merge Requests", url: namespace_project_merge_requests_path(@project.namespace, @project) },
-        { category: "Current Project", label: "Milestones",     url: namespace_project_milestones_path(@project.namespace, @project) },
-        { category: "Current Project", label: "Snippets",       url: namespace_project_snippets_path(@project.namespace, @project) },
-        { category: "Current Project", label: "Members",        url: namespace_project_settings_members_path(@project.namespace, @project) },
-        { category: "Current Project", label: "Wiki",           url: namespace_project_wikis_path(@project.namespace, @project) }
+        { category: "Current Project", label: "Files",          url: project_tree_path(@project, ref) },
+        { category: "Current Project", label: "Commits",        url: project_commits_path(@project, ref) },
+        { category: "Current Project", label: "Network",        url: project_network_path(@project, ref) },
+        { category: "Current Project", label: "Graph",          url: project_graph_path(@project, ref) },
+        { category: "Current Project", label: "Issues",         url: project_issues_path(@project) },
+        { category: "Current Project", label: "Merge Requests", url: project_merge_requests_path(@project) },
+        { category: "Current Project", label: "Milestones",     url: project_milestones_path(@project) },
+        { category: "Current Project", label: "Snippets",       url: project_snippets_path(@project) },
+        { category: "Current Project", label: "Members",        url: project_settings_members_path(@project) },
+        { category: "Current Project", label: "Wiki",           url: project_wikis_path(@project) }
       ]
     else
       []
@@ -104,7 +104,7 @@ module SearchHelper
         id: p.id,
         value: "#{search_result_sanitize(p.name)}",
         label: "#{search_result_sanitize(p.name_with_namespace)}",
-        url: namespace_project_path(p.namespace, p)
+        url: project_path(p)
       }
     end
   end
@@ -133,7 +133,7 @@ module SearchHelper
       data: {
         'project-id' => @project.id,
         'username-params' => @users.to_json(only: [:id, :username]),
-        'base-endpoint' => namespace_project_path(@project.namespace, @project)
+        'base-endpoint' => project_path(@project)
       }
     }
   end

app/helpers/snippets_helper.rb

 module SnippetsHelper
   def reliable_snippet_path(snippet, opts = nil)
     if snippet.project_id?
-      namespace_project_snippet_path(snippet.project.namespace,
-                                     snippet.project, snippet, opts)
+      project_snippet_path(snippet.project, snippet, opts)
     else
       snippet_path(snippet, opts)
     end
@@ -10,7 +9,7 @@ module SnippetsHelper
   def download_snippet_path(snippet)
     if snippet.project_id
-      raw_namespace_project_snippet_path(@project.namespace, @project, snippet, inline: false)
+      raw_project_snippet_path(@project, snippet, inline: false)
     else
       raw_snippet_path(snippet, inline: false)
     end
@@ -21,7 +20,7 @@ module SnippetsHelper
   # @returns String, path to snippet index
   def subject_snippets_path(subject = nil, opts = nil)
     if subject.is_a?(Project)
-      namespace_project_snippets_path(subject.namespace, subject, opts)
+      project_snippets_path(subject, opts)
     else # assume subject === User
       dashboard_snippets_path(opts)
     end

app/helpers/tab_helper.rb

@@ -107,8 +107,7 @@ module TabHelper
   def branches_tab_class
     if current_controller?(:protected_branches) ||
         current_controller?(:branches) ||
-        current_page?(namespace_project_repository_path(@project.namespace,
-                                                        @project))
+        current_page?(project_repository_path(@project))
       'active'
     end
   end

app/helpers/tags_helper.rb

@@ -10,7 +10,7 @@ module TagsHelper
     }
     options = exist_opts.merge(options)
-    namespace_project_tags_path(@project.namespace, @project, @id, options)
+    project_tags_path(@project, @id, options)
   end
   def tag_list(project)

app/helpers/todos_helper.rb

@@ -39,7 +39,7 @@ module TodosHelper
     anchor = dom_id(todo.note) if todo.note.present?
     if todo.for_commit?
-      namespace_project_commit_path(todo.project.namespace.becomes(Namespace), todo.project,
+      project_commit_path(todo.project,
                                     todo.target, anchor: anchor)
     else
       path = [todo.project.namespace.becomes(Namespace), todo.project, todo.target]

app/mailers/emails/issues.rb

@@ -31,7 +31,7 @@ module Emails
       setup_issue_mail(issue_id, recipient_id)
       @label_names = label_names
-      @labels_url = namespace_project_labels_url(@project.namespace, @project)
+      @labels_url = project_labels_url(@project)
       mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
     end
@@ -56,7 +56,7 @@ module Emails
     def setup_issue_mail(issue_id, recipient_id)
       @issue = Issue.find(issue_id)
       @project = @issue.project
-      @target_url = namespace_project_issue_url(@project.namespace, @project, @issue)
+      @target_url = project_issue_url(@project, @issue)
       @sent_notification = SentNotification.record(@issue, recipient_id, reply_key)
     end

app/mailers/emails/merge_requests.rb

@@ -22,7 +22,7 @@ module Emails
       setup_merge_request_mail(merge_request_id, recipient_id)
       @label_names = label_names
-      @labels_url = namespace_project_labels_url(@project.namespace, @project)
+      @labels_url = project_labels_url(@project)
       mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id))
     end
@@ -59,7 +59,7 @@ module Emails
     def setup_merge_request_mail(merge_request_id, recipient_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace, @project, @merge_request)
+      @target_url = project_merge_request_url(@project, @merge_request)
       @sent_notification = SentNotification.record(@merge_request, recipient_id, reply_key)
     end

app/mailers/emails/notes.rb

@@ -4,7 +4,7 @@ module Emails
       setup_note_mail(note_id, recipient_id)
       @commit = @note.noteable
-      @target_url = namespace_project_commit_url(*note_target_url_options)
+      @target_url = project_commit_url(*note_target_url_options)
       mail_answer_thread(@commit, note_thread_options(recipient_id))
     end
@@ -12,7 +12,7 @@ module Emails
       setup_note_mail(note_id, recipient_id)
       @issue = @note.noteable
-      @target_url = namespace_project_issue_url(*note_target_url_options)
+      @target_url = project_issue_url(*note_target_url_options)
       mail_answer_thread(@issue, note_thread_options(recipient_id))
     end
@@ -20,7 +20,7 @@ module Emails
       setup_note_mail(note_id, recipient_id)
       @merge_request = @note.noteable
-      @target_url = namespace_project_merge_request_url(*note_target_url_options)
+      @target_url = project_merge_request_url(*note_target_url_options)
       mail_answer_thread(@merge_request, note_thread_options(recipient_id))
     end
@@ -28,7 +28,7 @@ module Emails
       setup_note_mail(note_id, recipient_id)
       @snippet = @note.noteable
-      @target_url = namespace_project_snippet_url(*note_target_url_options)
+      @target_url = project_snippet_url(*note_target_url_options)
       mail_answer_thread(@snippet, note_thread_options(recipient_id))
     end
@@ -43,7 +43,7 @@ module Emails
     private
     def note_target_url_options
-      [@project.namespace, @project, @note.noteable, anchor: "note_#{@note.id}"]
+      [@project, @note.noteable, anchor: "note_#{@note.id}"]
     end
     def note_thread_options(recipient_id)

app/mailers/emails/projects.rb

@@ -3,7 +3,7 @@ module Emails
     def project_was_moved_email(project_id, user_id, old_path_with_namespace)
       @current_user = @user = User.find user_id
       @project = Project.find project_id
-      @target_url = namespace_project_url(@project.namespace, @project)
+      @target_url = project_url(@project)
       @old_path_with_namespace = old_path_with_namespace
       mail(to: @user.notification_email,
            subject: subject("Project was moved"))