Commit 1591b7c0 authored by Nick Thomas's avatar Nick Thomas

Fix EE Cop/RedirectWithStatus failures introduced by merge

parent 29a3ac19
...@@ -25,7 +25,7 @@ class Admin::GeoNodesController < Admin::ApplicationController ...@@ -25,7 +25,7 @@ class Admin::GeoNodesController < Admin::ApplicationController
def destroy def destroy
@node.destroy @node.destroy
redirect_to admin_geo_nodes_path, notice: 'Node was successfully removed.' redirect_to admin_geo_nodes_path, status: 302, notice: 'Node was successfully removed.'
end end
def repair def repair
......
...@@ -43,7 +43,7 @@ class Admin::LicensesController < Admin::ApplicationController ...@@ -43,7 +43,7 @@ class Admin::LicensesController < Admin::ApplicationController
flash[:alert] = "The license was removed. GitLab now no longer has a valid license." flash[:alert] = "The license was removed. GitLab now no longer has a valid license."
end end
redirect_to admin_license_path redirect_to admin_license_path, status: 302
end end
private private
......
...@@ -43,7 +43,7 @@ class Groups::HooksController < Groups::ApplicationController ...@@ -43,7 +43,7 @@ class Groups::HooksController < Groups::ApplicationController
def destroy def destroy
hook.destroy hook.destroy
redirect_to group_hooks_path(@group) redirect_to group_hooks_path(@group), status: 302
end end
private private
......
...@@ -60,7 +60,7 @@ class Projects::BoardsController < Projects::ApplicationController ...@@ -60,7 +60,7 @@ class Projects::BoardsController < Projects::ApplicationController
service.execute(@board) service.execute(@board)
respond_to do |format| respond_to do |format|
format.html { redirect_to namespace_project_boards_path(@project.namespace, @project) } format.html { redirect_to namespace_project_boards_path(@project.namespace, @project), status: 302 }
end end
end end
......
...@@ -36,7 +36,7 @@ class Projects::PathLocksController < Projects::ApplicationController ...@@ -36,7 +36,7 @@ class Projects::PathLocksController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to namespace_project_locks_path(@project.namespace, @project) redirect_to namespace_project_locks_path(@project.namespace, @project), status: 302
end end
format.js format.js
end end
......
...@@ -8,6 +8,7 @@ module Projects ...@@ -8,6 +8,7 @@ module Projects
@merge_access_level.destroy @merge_access_level.destroy
redirect_to namespace_project_protected_branch_path(@project.namespace, @project, @protected_branch), redirect_to namespace_project_protected_branch_path(@project.namespace, @project, @protected_branch),
status: 302,
notice: "Successfully deleted. #{@merge_access_level.humanize} will not be able to merge into this protected branch." notice: "Successfully deleted. #{@merge_access_level.humanize} will not be able to merge into this protected branch."
end end
end end
......
...@@ -8,6 +8,7 @@ module Projects ...@@ -8,6 +8,7 @@ module Projects
@push_access_level.destroy @push_access_level.destroy
redirect_to namespace_project_protected_branch_path(@project.namespace, @project, @protected_branch), redirect_to namespace_project_protected_branch_path(@project.namespace, @project, @protected_branch),
status: 302,
notice: "Successfully deleted. #{@push_access_level.humanize} will not be able to push to this protected branch." notice: "Successfully deleted. #{@push_access_level.humanize} will not be able to push to this protected branch."
end end
end end
......
...@@ -8,6 +8,7 @@ module Projects ...@@ -8,6 +8,7 @@ module Projects
@create_access_level.destroy @create_access_level.destroy
redirect_to namespace_project_protected_tag_path(@project.namespace, @project, @protected_tag), redirect_to namespace_project_protected_tag_path(@project.namespace, @project, @protected_tag),
status: 302,
notice: "Successfully deleted. #{@create_access_level.humanize} will not be able to create this protected tag." notice: "Successfully deleted. #{@create_access_level.humanize} will not be able to create this protected tag."
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment