diff options
author | Rémy Coutable <remy@rymai.me> | 2016-04-07 11:27:37 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-04-07 11:27:37 +0300 |
commit | 2817c541375bcb5478bc2d922decb017efbe26a5 (patch) | |
tree | c926a1d72798c559c9a5ce784201d65b7cc28928 /app/controllers/projects/application_controller.rb | |
parent | 7266972b52311e6796f68a9a17ecd3fe3db167ff (diff) | |
parent | 924e4b370013ae3a8448a2a68e6a4d353b23b699 (diff) |
Merge branch 'return-303-for-branch-deletion' into 'master'
Return status code 303 after a branch DELETE operation to avoid project deletion
Closes #14994
See merge request !3583
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
-rw-r--r-- | app/controllers/projects/application_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 657ee94cfd7..74150ad606b 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -68,7 +68,9 @@ class Projects::ApplicationController < ApplicationController end def require_non_empty_project - redirect_to namespace_project_path(@project.namespace, @project) if @project.empty_repo? + # Be sure to return status code 303 to avoid a double DELETE: + # http://api.rubyonrails.org/classes/ActionController/Redirecting.html + redirect_to namespace_project_path(@project.namespace, @project), status: 303 if @project.empty_repo? end def require_branch_head |