diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-11-30 12:00:13 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-30 12:00:13 -0500 |
| commit | 244c9a00e05963fe7cc21a9dd8abf1d4ec1be078 (patch) | |
| tree | 8699dc956bffa27a0a0973b5fde44f0eff1b2cc8 /app | |
| parent | e0131c5d07f22681e4118473dbfa0dd93df12b28 (diff) | |
| parent | 2497d3d550dc0d4e095c8c3fe75d4452fb163252 (diff) | |
| download | gitlab-ce-244c9a00e05963fe7cc21a9dd8abf1d4ec1be078.tar.gz | |
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 |