From 128012dba8737b0dc65d41a3eb1690c9d8797a34 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 25 Feb 2015 19:50:01 -0800
Subject: [PATCH] More use of shortcut routes
---
app/controllers/projects/issues_controller.rb | 8 +++-----
app/controllers/projects/merge_requests_controller.rb | 4 +---
.../projects/merge_requests/_merge_request.html.haml | 2 +-
app/views/projects/merge_requests/show/_diffs.html.haml | 2 +-
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 73b58285c61..6a2af08a199 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 98e4775e409..f07923d6d9e 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 d94636712be..1eba1a96b7b 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 eb1640891e6..cfef1d5e4cc 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.
--
GitLab