Commit a544e46b authored by blackst0ne's avatar blackst0ne

Add a rubocop rule to check if a method 'redirect_to' is used without...

Add a rubocop rule to check if a method 'redirect_to' is used without explicitly set 'status' in 'destroy' actions of controllers
parent 71f9c43c
...@@ -39,7 +39,7 @@ class Admin::ApplicationsController < Admin::ApplicationController ...@@ -39,7 +39,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
def destroy def destroy
@application.destroy @application.destroy
redirect_to admin_applications_url, notice: 'Application was successfully destroyed.' redirect_to admin_applications_url, status: 302, notice: 'Application was successfully destroyed.'
end end
private private
......
...@@ -23,7 +23,7 @@ class Admin::DeployKeysController < Admin::ApplicationController ...@@ -23,7 +23,7 @@ class Admin::DeployKeysController < Admin::ApplicationController
deploy_key.destroy deploy_key.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to admin_deploy_keys_path } format.html { redirect_to admin_deploy_keys_path, status: 302 }
format.json { head :ok } format.json { head :ok }
end end
end end
......
...@@ -56,7 +56,9 @@ class Admin::GroupsController < Admin::ApplicationController ...@@ -56,7 +56,9 @@ class Admin::GroupsController < Admin::ApplicationController
def destroy def destroy
Groups::DestroyService.new(@group, current_user).async_execute Groups::DestroyService.new(@group, current_user).async_execute
redirect_to admin_groups_path, alert: "Group '#{@group.name}' was scheduled for deletion." redirect_to admin_groups_path,
status: 302,
alert: "Group '#{@group.name}' was scheduled for deletion."
end end
private private
......
...@@ -34,7 +34,7 @@ class Admin::HooksController < Admin::ApplicationController ...@@ -34,7 +34,7 @@ class Admin::HooksController < Admin::ApplicationController
def destroy def destroy
hook.destroy hook.destroy
redirect_to admin_hooks_path redirect_to admin_hooks_path, status: 302
end end
def test def test
......
...@@ -36,9 +36,9 @@ class Admin::IdentitiesController < Admin::ApplicationController ...@@ -36,9 +36,9 @@ class Admin::IdentitiesController < Admin::ApplicationController
def destroy def destroy
if @identity.destroy if @identity.destroy
RepairLdapBlockedUserService.new(@user).execute RepairLdapBlockedUserService.new(@user).execute
redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.' redirect_to admin_user_identities_path(@user), status: 302, notice: 'User identity was successfully removed.'
else else
redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.' redirect_to admin_user_identities_path(@user), status: 302, alert: 'Failed to remove user identity.'
end end
end end
......
...@@ -11,7 +11,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController ...@@ -11,7 +11,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController
session[:impersonator_id] = nil session[:impersonator_id] = nil
redirect_to admin_user_path(original_user) redirect_to admin_user_path(original_user), status: 302
end end
private private
......
...@@ -15,9 +15,9 @@ class Admin::KeysController < Admin::ApplicationController ...@@ -15,9 +15,9 @@ class Admin::KeysController < Admin::ApplicationController
respond_to do |format| respond_to do |format|
if key.destroy if key.destroy
format.html { redirect_to keys_admin_user_path(user), notice: 'User key was successfully removed.' } format.html { redirect_to keys_admin_user_path(user), status: 302, notice: 'User key was successfully removed.' }
else else
format.html { redirect_to keys_admin_user_path(user), alert: 'Failed to remove user key.' } format.html { redirect_to keys_admin_user_path(user), status: 302, alert: 'Failed to remove user key.' }
end end
end end
end end
......
...@@ -41,7 +41,7 @@ class Admin::LabelsController < Admin::ApplicationController ...@@ -41,7 +41,7 @@ class Admin::LabelsController < Admin::ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to(admin_labels_path, notice: 'Label was removed') redirect_to admin_labels_path, status: 302, notice: 'Label was removed'
end end
format.js format.js
end end
......
...@@ -18,7 +18,7 @@ class Admin::RunnerProjectsController < Admin::ApplicationController ...@@ -18,7 +18,7 @@ class Admin::RunnerProjectsController < Admin::ApplicationController
runner = rp.runner runner = rp.runner
rp.destroy rp.destroy
redirect_to admin_runner_path(runner) redirect_to admin_runner_path(runner), status: 302
end end
private private
......
...@@ -27,7 +27,7 @@ class Admin::RunnersController < Admin::ApplicationController ...@@ -27,7 +27,7 @@ class Admin::RunnersController < Admin::ApplicationController
def destroy def destroy
@runner.destroy @runner.destroy
redirect_to admin_runners_path redirect_to admin_runners_path, status: 302
end end
def resume def resume
......
...@@ -8,7 +8,9 @@ class Admin::SpamLogsController < Admin::ApplicationController ...@@ -8,7 +8,9 @@ class Admin::SpamLogsController < Admin::ApplicationController
if params[:remove_user] if params[:remove_user]
spam_log.remove_user(deleted_by: current_user) spam_log.remove_user(deleted_by: current_user)
redirect_to admin_spam_logs_path, notice: "User #{spam_log.user.username} was successfully removed." redirect_to admin_spam_logs_path,
status: 302,
notice: "User #{spam_log.user.username} was successfully removed."
else else
spam_log.destroy spam_log.destroy
head :ok head :ok
......
...@@ -141,7 +141,7 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -141,7 +141,7 @@ class Admin::UsersController < Admin::ApplicationController
user.delete_async(deleted_by: current_user, params: params.permit(:hard_delete)) user.delete_async(deleted_by: current_user, params: params.permit(:hard_delete))
respond_to do |format| respond_to do |format|
format.html { redirect_to admin_users_path, notice: "The user is being deleted." } format.html { redirect_to admin_users_path, status: 302, notice: "The user is being deleted." }
format.json { head :ok } format.json { head :ok }
end end
end end
......
...@@ -15,7 +15,11 @@ class Dashboard::TodosController < Dashboard::ApplicationController ...@@ -15,7 +15,11 @@ class Dashboard::TodosController < Dashboard::ApplicationController
TodoService.new.mark_todos_as_done_by_ids([params[:id]], current_user) TodoService.new.mark_todos_as_done_by_ids([params[:id]], current_user)
respond_to do |format| respond_to do |format|
format.html { redirect_to dashboard_todos_path, notice: 'Todo was successfully marked as done.' } format.html do
redirect_to dashboard_todos_path,
status: 302,
notice: 'Todo was successfully marked as done.'
end
format.js { head :ok } format.js { head :ok }
format.json { render json: todos_counts } format.json { render json: todos_counts }
end end
...@@ -25,7 +29,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController ...@@ -25,7 +29,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
updated_ids = TodoService.new.mark_todos_as_done(@todos, current_user) updated_ids = TodoService.new.mark_todos_as_done(@todos, current_user)
respond_to do |format| respond_to do |format|
format.html { redirect_to dashboard_todos_path, notice: 'All todos were marked as done.' } format.html { redirect_to dashboard_todos_path, status: 302, notice: 'All todos were marked as done.' }
format.js { head :ok } format.js { head :ok }
format.json { render json: todos_counts.merge(updated_ids: updated_ids) } format.json { render json: todos_counts.merge(updated_ids: updated_ids) }
end end
......
...@@ -5,6 +5,6 @@ class Groups::AvatarsController < Groups::ApplicationController ...@@ -5,6 +5,6 @@ class Groups::AvatarsController < Groups::ApplicationController
@group.remove_avatar! @group.remove_avatar!
@group.save @group.save
redirect_to edit_group_path(@group) redirect_to edit_group_path(@group), status: 302
end end
end end
...@@ -54,7 +54,7 @@ class Groups::LabelsController < Groups::ApplicationController ...@@ -54,7 +54,7 @@ class Groups::LabelsController < Groups::ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to group_labels_path(@group), notice: 'Label was removed' redirect_to group_labels_path(@group), status: 302, notice: 'Label was removed'
end end
format.js format.js
end end
......
...@@ -101,7 +101,7 @@ class GroupsController < Groups::ApplicationController ...@@ -101,7 +101,7 @@ class GroupsController < Groups::ApplicationController
def destroy def destroy
Groups::DestroyService.new(@group, current_user).async_execute Groups::DestroyService.new(@group, current_user).async_execute
redirect_to root_path, alert: "Group '#{@group.name}' was scheduled for deletion." redirect_to root_path, status: 302, alert: "Group '#{@group.name}' was scheduled for deletion."
end end
protected protected
...@@ -173,7 +173,7 @@ class GroupsController < Groups::ApplicationController ...@@ -173,7 +173,7 @@ class GroupsController < Groups::ApplicationController
def build_canonical_path(group) def build_canonical_path(group)
return group_path(group) if action_name == 'show' # root group path return group_path(group) if action_name == 'show' # root group path
params[:id] = group.to_param params[:id] = group.to_param
url_for(params) url_for(params)
......
...@@ -10,6 +10,8 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio ...@@ -10,6 +10,8 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
Doorkeeper::AccessToken.revoke_all_for(params[:id], current_resource_owner) Doorkeeper::AccessToken.revoke_all_for(params[:id], current_resource_owner)
end end
redirect_to applications_profile_url, notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy]) redirect_to applications_profile_url,
status: 302,
notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy])
end end
end end
...@@ -5,6 +5,6 @@ class Profiles::AvatarsController < Profiles::ApplicationController ...@@ -5,6 +5,6 @@ class Profiles::AvatarsController < Profiles::ApplicationController
@user.save @user.save
redirect_to profile_path redirect_to profile_path, status: 302
end end
end end
...@@ -39,7 +39,7 @@ class Profiles::ChatNamesController < Profiles::ApplicationController ...@@ -39,7 +39,7 @@ class Profiles::ChatNamesController < Profiles::ApplicationController
flash[:alert] = "Could not delete chat nickname #{@chat_name.chat_name}." flash[:alert] = "Could not delete chat nickname #{@chat_name.chat_name}."
end end
redirect_to profile_chat_names_path redirect_to profile_chat_names_path, status: 302
end end
private private
......
...@@ -23,7 +23,7 @@ class Profiles::EmailsController < Profiles::ApplicationController ...@@ -23,7 +23,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
current_user.update_secondary_emails! current_user.update_secondary_emails!
respond_to do |format| respond_to do |format|
format.html { redirect_to profile_emails_url } format.html { redirect_to profile_emails_url, status: 302 }
format.js { head :ok } format.js { head :ok }
end end
end end
......
...@@ -26,7 +26,7 @@ class Profiles::KeysController < Profiles::ApplicationController ...@@ -26,7 +26,7 @@ class Profiles::KeysController < Profiles::ApplicationController
@key.destroy @key.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to profile_keys_url } format.html { redirect_to profile_keys_url, status: 302 }
format.js { head :ok } format.js { head :ok }
end end
end end
......
...@@ -77,7 +77,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController ...@@ -77,7 +77,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
def destroy def destroy
current_user.disable_two_factor! current_user.disable_two_factor!
redirect_to profile_account_path redirect_to profile_account_path, status: 302
end end
def skip def skip
......
...@@ -2,6 +2,6 @@ class Profiles::U2fRegistrationsController < Profiles::ApplicationController ...@@ -2,6 +2,6 @@ class Profiles::U2fRegistrationsController < Profiles::ApplicationController
def destroy def destroy
u2f_registration = current_user.u2f_registrations.find(params[:id]) u2f_registration = current_user.u2f_registrations.find(params[:id])
u2f_registration.destroy u2f_registration.destroy
redirect_to profile_two_factor_auth_path, notice: "Successfully deleted U2F device." redirect_to profile_two_factor_auth_path, status: 302, notice: "Successfully deleted U2F device."
end end
end end
...@@ -21,6 +21,6 @@ class Projects::AvatarsController < Projects::ApplicationController ...@@ -21,6 +21,6 @@ class Projects::AvatarsController < Projects::ApplicationController
@project.save @project.save
redirect_to edit_project_path(@project) redirect_to edit_project_path(@project), status: 302
end end
end end
...@@ -36,7 +36,7 @@ class Projects::GroupLinksController < Projects::ApplicationController ...@@ -36,7 +36,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to namespace_project_settings_members_path(project.namespace, project) redirect_to namespace_project_settings_members_path(project.namespace, project), status: 302
end end
format.js { head :ok } format.js { head :ok }
end end
......
...@@ -47,7 +47,7 @@ class Projects::HooksController < Projects::ApplicationController ...@@ -47,7 +47,7 @@ class Projects::HooksController < Projects::ApplicationController
def destroy def destroy
hook.destroy hook.destroy
redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) redirect_to namespace_project_settings_integrations_path(@project.namespace, @project), status: 302
end end
private private
......
...@@ -74,7 +74,9 @@ class Projects::LabelsController < Projects::ApplicationController ...@@ -74,7 +74,9 @@ class Projects::LabelsController < Projects::ApplicationController
@label.destroy @label.destroy
@labels = find_labels @labels = find_labels
redirect_to(namespace_project_labels_path(@project.namespace, @project), notice: 'Label was removed') redirect_to namespace_project_labels_path(@project.namespace, @project),
status: 302,
notice: 'Label was removed'
end end
def remove_priority def remove_priority
......
...@@ -80,7 +80,7 @@ class Projects::MilestonesController < Projects::ApplicationController ...@@ -80,7 +80,7 @@ class Projects::MilestonesController < Projects::ApplicationController
Milestones::DestroyService.new(project, current_user).execute(milestone) Milestones::DestroyService.new(project, current_user).execute(milestone)
respond_to do |format| respond_to do |format|
format.html { redirect_to namespace_project_milestones_path } format.html { redirect_to namespace_project_milestones_path, status: 302 }
format.js { head :ok } format.js { head :ok }
end end
end end
......
...@@ -15,8 +15,9 @@ class Projects::PagesController < Projects::ApplicationController ...@@ -15,8 +15,9 @@ class Projects::PagesController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to(namespace_project_pages_path(@project.namespace, @project), redirect_to namespace_project_pages_path(@project.namespace, @project),
notice: 'Pages were removed') status: 302,
notice: 'Pages were removed'
end end
end end
end end
......
...@@ -27,8 +27,9 @@ class Projects::PagesDomainsController < Projects::ApplicationController ...@@ -27,8 +27,9 @@ class Projects::PagesDomainsController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to(namespace_project_pages_path(@project.namespace, @project), redirect_to namespace_project_pages_path(@project.namespace, @project),
notice: 'Domain was removed') status: 302,
notice: 'Domain was removed'
end end
format.js format.js
end end
......
...@@ -49,9 +49,11 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController ...@@ -49,9 +49,11 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
def destroy def destroy
if schedule.destroy if schedule.destroy
redirect_to pipeline_schedules_path(@project) redirect_to pipeline_schedules_path(@project), status: 302
else else
redirect_to pipeline_schedules_path(@project), alert: "Failed to remove the pipeline schedule" redirect_to pipeline_schedules_path(@project),
status: 302,
alert: "Failed to remove the pipeline schedule"
end end
end end
......
...@@ -11,9 +11,11 @@ module Projects ...@@ -11,9 +11,11 @@ module Projects
def destroy def destroy
if image.destroy if image.destroy
redirect_to project_container_registry_path(@project), redirect_to project_container_registry_path(@project),
status: 302,
notice: 'Image repository has been removed successfully!' notice: 'Image repository has been removed successfully!'
else else
redirect_to project_container_registry_path(@project), redirect_to project_container_registry_path(@project),
status: 302,
alert: 'Failed to remove image repository!' alert: 'Failed to remove image repository!'
end end
end end
......
...@@ -6,9 +6,11 @@ module Projects ...@@ -6,9 +6,11 @@ module Projects
def destroy def destroy
if tag.delete if tag.delete
redirect_to project_container_registry_path(@project), redirect_to project_container_registry_path(@project),
status: 302,
notice: 'Registry tag has been removed successfully!' notice: 'Registry tag has been removed successfully!'
else else
redirect_to project_container_registry_path(@project), redirect_to project_container_registry_path(@project),
status: 302,
alert: 'Failed to remove registry tag!' alert: 'Failed to remove registry tag!'
end end
end end
......
...@@ -22,6 +22,6 @@ class Projects::RunnerProjectsController < Projects::ApplicationController ...@@ -22,6 +22,6 @@ class Projects::RunnerProjectsController < Projects::ApplicationController
runner_project = project.runner_projects.find(params[:id]) runner_project = project.runner_projects.find(params[:id])
runner_project.destroy runner_project.destroy
redirect_to runners_path(project) redirect_to runners_path(project), status: 302
end end
end end
...@@ -24,7 +24,7 @@ class Projects::RunnersController < Projects::ApplicationController ...@@ -24,7 +24,7 @@ class Projects::RunnersController < Projects::ApplicationController
@runner.destroy @runner.destroy
end end
redirect_to runners_path(@project) redirect_to runners_path(@project), status: 302
end end
def resume def resume
......
...@@ -79,7 +79,7 @@ class Projects::SnippetsController < Projects::ApplicationController ...@@ -79,7 +79,7 @@ class Projects::SnippetsController < Projects::ApplicationController
@snippet.destroy @snippet.destroy
redirect_to namespace_project_snippets_path(@project.namespace, @project) redirect_to namespace_project_snippets_path(@project.namespace, @project), status: 302
end end
protected protected
......
...@@ -50,7 +50,7 @@ class Projects::TriggersController < Projects::ApplicationController ...@@ -50,7 +50,7 @@ class Projects::TriggersController < Projects::ApplicationController
flash[:alert] = "Could not remove the trigger." flash[:alert] = "Could not remove the trigger."
end end
redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project) redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project), status: 302
end end
private private
......
...@@ -36,7 +36,9 @@ class Projects::VariablesController < Projects::ApplicationController ...@@ -36,7 +36,9 @@ class Projects::VariablesController < Projects::ApplicationController
@key = @project.variables.find(params[:id]) @key = @project.variables.find(params[:id])
@key.destroy @key.destroy
redirect_to namespace_project_settings_ci_cd_path(project.namespace, project), notice: 'Variable was successfully removed.' redirect_to namespace_project_settings_ci_cd_path(project.namespace, project),
status: 302,
notice: 'Variable was successfully removed.'
end end
private private
......
...@@ -85,10 +85,9 @@ class Projects::WikisController < Projects::ApplicationController ...@@ -85,10 +85,9 @@ class Projects::WikisController < Projects::ApplicationController
@page = @project_wiki.find_page(params[:id]) @page = @project_wiki.find_page(params[:id])
WikiPages::DestroyService.new(@project, current_user).execute(@page) WikiPages::DestroyService.new(@project, current_user).execute(@page)
redirect_to( redirect_to namespace_project_wiki_path(@project.namespace, @project, :home),
namespace_project_wiki_path(@project.namespace, @project, :home), status: 302,
notice: "Page was successfully deleted" notice: "Page was successfully deleted"
)
end end
def git_access def git_access
......
...@@ -119,9 +119,9 @@ class ProjectsController < Projects::ApplicationController ...@@ -119,9 +119,9 @@ class ProjectsController < Projects::ApplicationController
::Projects::DestroyService.new(@project, current_user, {}).async_execute ::Projects::DestroyService.new(@project, current_user, {}).async_execute
flash[:alert] = "Project '#{@project.name_with_namespace}' will be deleted." flash[:alert] = "Project '#{@project.name_with_namespace}' will be deleted."
redirect_to dashboard_projects_path redirect_to dashboard_projects_path, status: 302
rescue Projects::DestroyService::DestroyError => ex rescue Projects::DestroyService::DestroyError => ex
redirect_to edit_project_path(@project), alert: ex.message redirect_to edit_project_path(@project), status: 302, alert: ex.message
end end
def new_issue_address def new_issue_address
......
...@@ -30,7 +30,7 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -30,7 +30,7 @@ class RegistrationsController < Devise::RegistrationsController
respond_to do |format| respond_to do |format|
format.html do format.html do
session.try(:destroy) session.try(:destroy)
redirect_to new_user_session_path, notice: "Account scheduled for removal." redirect_to new_user_session_path, status: 302, notice: "Account scheduled for removal."
end end
end end
end end
......
...@@ -13,7 +13,7 @@ module Sherlock ...@@ -13,7 +13,7 @@ module Sherlock
def destroy_all def destroy_all
Gitlab::Sherlock.collection.clear Gitlab::Sherlock.collection.clear
redirect_to(:back) redirect_to :back, status: 302
end end
end end
end end
...@@ -82,7 +82,7 @@ class SnippetsController < ApplicationController ...@@ -82,7 +82,7 @@ class SnippetsController < ApplicationController
@snippet.destroy @snippet.destroy
redirect_to snippets_path redirect_to snippets_path, status: 302
end end
def preview_markdown