diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-10-26 16:49:14 +0100 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-10-26 16:49:14 +0100 |
| commit | 98cc695afb2fc97a1ca897ad28741612bcde88a3 (patch) | |
| tree | 14ebe36a0e5f67573869a70b9dd95c04d0f79c69 | |
| parent | 2f56d89c9e22637cdb9e310c41f724f9ed450ea5 (diff) | |
| parent | 0bfb9cbf38c72f801255b910430fdbff6536b73d (diff) | |
| download | gitlab-ce-98cc695afb2fc97a1ca897ad28741612bcde88a3.tar.gz | |
Merge pull request #9771 from kazubu/fix_error_destroy_without_referer
Fix: 500 error returned if destroy request without HTTP referer
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 256cb58fd34..ea8c6fb5c17 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 8.2.0 (unreleased) - Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork - Use git follow flag for commits page when retrieve history for file or directory - Show merge request CI status on merge requests index page + - Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu) v 8.1.1 - Fix cloning Wiki repositories via HTTP (Stan Hu) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 82119022cf9..05c7d3de8bc 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -124,11 +124,7 @@ class ProjectsController < ApplicationController ::Projects::DestroyService.new(@project, current_user, {}).execute flash[:alert] = "Project '#{@project.name}' was deleted." - if request.referer.include?('/admin') - redirect_to admin_namespaces_projects_path - else - redirect_to dashboard_projects_path - end + redirect_back_or_default(default: dashboard_projects_path, options: {}) rescue Projects::DestroyService::DestroyError => ex redirect_to edit_project_path(@project), alert: ex.message end |