summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-24 21:18:20 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-24 21:18:20 +0000
commitb7dd0decf8da8f069c0fb725eea0c1162cddd4c3 (patch)
tree3faef210aae1d453c9bbe5531acc9fcf5d9e7ae0
parent53784fb6371a0ab3072859e457adeb279e358c5e (diff)
parent746dd89ab010299f731c195082087d32f25698df (diff)
downloadgitlab-ce-b7dd0decf8da8f069c0fb725eea0c1162cddd4c3.tar.gz
Merge branch 'fix-404-admin-delete' into 'master'
Fix 404 when deleting a project from the admin section This is some additional fallout from the rails upgrade. Need to use plural namespaces in the path function to get project deletion to go back to the project listing. See merge request !351
-rw-r--r--app/controllers/projects_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 38341b1c8c6..d1583e6ebfb 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -102,7 +102,7 @@ class ProjectsController < ApplicationController
flash[:alert] = 'Project deleted.'
if request.referer.include?('/admin')
- redirect_to admin_namespace_projects_path
+ redirect_to admin_namespaces_projects_path
else
redirect_to projects_dashboard_path
end