diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 73b58285c61702de93e5cffa6a513c04b0567565..6a2af08a199a284270f8299347edbae07d74227d 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -60,8 +60,7 @@ class Projects::IssuesController < Projects::ApplicationController
     respond_to do |format|
       format.html do
         if @issue.valid?
-          redirect_to namespace_project_issue_path(@project.namespace,
-                                                   @project, @issue)
+          redirect_to issue_path(@issue)
         else
           render :new
         end
@@ -79,7 +78,7 @@ class Projects::IssuesController < Projects::ApplicationController
       format.js
       format.html do
         if @issue.valid?
-          redirect_to [@project.namespace.becomes(Namespace), @project, @issue]
+          redirect_to issue_path(@issue)
         else
           render :edit
         end
@@ -129,8 +128,7 @@ class Projects::IssuesController < Projects::ApplicationController
     issue = @project.issues.find_by(id: params[:id])
 
     if issue
-      redirect_to namespace_project_issue_path(@project.namespace, @project,
-                                               issue)
+      redirect_to issue_path(issue)
       return
     else
       raise ActiveRecord::RecordNotFound.new
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 98e4775e4092eec40adbccf083d3eee59c4ed394..f07923d6d9eb91ea37361c6298e5e514f463b5c0 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -79,9 +79,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     if @merge_request.valid?
       redirect_to(
-        namespace_project_merge_request_path(@merge_request.target_project.namespace,
-                                             @merge_request.target_project,
-                                             @merge_request),
+        merge_request_path(@merge_request)
         notice: 'Merge request was successfully created.'
       )
     else
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index d94636712bee83753e3a20d72c5a9c66a0824024..1eba1a96b7b59f75d2b1bb069d2b92dea629c8c1 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -1,7 +1,7 @@
 %li{ class: mr_css_classes(merge_request) }
   .merge-request-title
     %span.str-truncated
-      = link_to_gfm merge_request.title, namespace_project_merge_request_path(merge_request.target_project.namespace, merge_request.target_project, merge_request), class: "row_title"
+      = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
     .pull-right.light
       - if merge_request.merged?
         %span
diff --git a/app/views/projects/merge_requests/show/_diffs.html.haml b/app/views/projects/merge_requests/show/_diffs.html.haml
index eb1640891e66dee26483d6488638b9ad4ba7e128..cfef1d5e4cca3cea1a4b18d848d0c4c88b58ec6b 100644
--- a/app/views/projects/merge_requests/show/_diffs.html.haml
+++ b/app/views/projects/merge_requests/show/_diffs.html.haml
@@ -8,5 +8,5 @@
       Changes view for this comparison is extremely large.
     %p
       You can
-      = link_to "download it", namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, format: :diff), class: "vlink"
+      = link_to "download it", merge_request_path(@merge_request, format: :diff), class: "vlink"
       instead.