diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-11-30 20:00:13 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-30 20:03:13 +0300 |
| commit | 531272a5209020f0e663786f0d2114462898337b (patch) | |
| tree | 704e0c65f55090e4f6989cc4bc9934947b51fbff /app | |
| parent | d2f21bf72ae842c81c00b840f7e39780c442e717 (diff) | |
Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'
See merge request !1916
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 23453195e85..10c75370d7b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -123,7 +123,7 @@ class ProjectsController < ApplicationController ::Projects::DestroyService.new(@project, current_user, {}).execute flash[:alert] = "Project '#{@project.name}' was deleted." - redirect_back_or_default(default: dashboard_projects_path, options: {}) + redirect_to dashboard_projects_path rescue Projects::DestroyService::DestroyError => ex redirect_to edit_project_path(@project), alert: ex.message end |