summaryrefslogtreecommitdiff
path: root/app/controllers/projects/application_controller.rb
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-04-11 16:45:58 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-04-11 16:45:58 -0500
commit44727525952f22c2234d2991e20f4f4f8bac3221 (patch)
treec34babda3b6b6014f8a05870922fe8f4855983cf /app/controllers/projects/application_controller.rb
parent38a4f5cec6ab85525ab9db1d7d2669a77171f768 (diff)
parent7998725e3c2557c04ceece028dd73a316a3a746c (diff)
downloadgitlab-ce-issue_14206.tar.gz
Merge branch 'master' into issue_14206issue_14206
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
-rw-r--r--app/controllers/projects/application_controller.rb4
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