diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-09-11 11:46:08 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-09-11 11:46:08 +0200 |
| commit | bf0de1a500e7a9aecc7c8bbf623ad39b75c6433b (patch) | |
| tree | 382df65e2b17c91e03278d58bce8dce0129a6a7b /app/controllers/projects_controller.rb | |
| parent | b18d1c2786c2a385d6b797734a1afad7a01ddf35 (diff) | |
| parent | 78ec7d9c9d156fe556d165c1c096bf5534d62d25 (diff) | |
| download | gitlab-ce-bf0de1a500e7a9aecc7c8bbf623ad39b75c6433b.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f23afaf28fa..b3380a6ff23 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -103,7 +103,15 @@ class ProjectsController < ApplicationController ::Projects::DestroyService.new(@project, current_user, {}).execute respond_to do |format| - format.html { redirect_to root_path } + format.html do + flash[:alert] = "Project deleted." + + if request.referer.include?("/admin") + redirect_to admin_projects_path + else + redirect_to projects_dashboard_path + end + end end end |