diff options
Diffstat (limited to 'app/services')
12 files changed, 13 insertions, 14 deletions
diff --git a/app/services/alert_management/create_alert_issue_service.rb b/app/services/alert_management/create_alert_issue_service.rb index 0197f29145d..beacd240b08 100644 --- a/app/services/alert_management/create_alert_issue_service.rb +++ b/app/services/alert_management/create_alert_issue_service.rb @@ -29,8 +29,7 @@ module AlertManagement delegate :project, to: :alert def allowed? - Feature.enabled?(:alert_management_create_alert_issue, project) && - user.can?(:create_issue, project) + user.can?(:create_issue, project) end def create_issue(alert, user, alert_payload) diff --git a/app/services/award_emojis/destroy_service.rb b/app/services/award_emojis/destroy_service.rb index a61a7911a9d..cfd194262f9 100644 --- a/app/services/award_emojis/destroy_service.rb +++ b/app/services/award_emojis/destroy_service.rb @@ -13,7 +13,7 @@ module AwardEmojis return error("User has not awarded emoji of type #{name} on the awardable", status: :forbidden) end - award = awards.destroy_all.first # rubocop: disable DestroyAll + award = awards.destroy_all.first # rubocop: disable Cop/DestroyAll after_destroy(award) success(award: award) diff --git a/app/services/labels/promote_service.rb b/app/services/labels/promote_service.rb index cc91fd4b4d2..9ed10f6a11b 100644 --- a/app/services/labels/promote_service.rb +++ b/app/services/labels/promote_service.rb @@ -90,7 +90,7 @@ module Labels # rubocop: disable CodeReuse/ActiveRecord def destroy_project_labels(label_ids) - Label.where(id: label_ids).destroy_all # rubocop: disable DestroyAll + Label.where(id: label_ids).destroy_all # rubocop: disable Cop/DestroyAll end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/services/milestones/promote_service.rb b/app/services/milestones/promote_service.rb index 80e6456f729..2431318cbb2 100644 --- a/app/services/milestones/promote_service.rb +++ b/app/services/milestones/promote_service.rb @@ -76,7 +76,7 @@ module Milestones # rubocop: disable CodeReuse/ActiveRecord def destroy_old_milestones(milestone) - Milestone.where(id: milestone_ids_for_merge(milestone)).destroy_all # rubocop: disable DestroyAll + Milestone.where(id: milestone_ids_for_merge(milestone)).destroy_all # rubocop: disable Cop/DestroyAll end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/services/pages/delete_service.rb b/app/services/pages/delete_service.rb index d4de6bb750d..7408943e78c 100644 --- a/app/services/pages/delete_service.rb +++ b/app/services/pages/delete_service.rb @@ -4,7 +4,7 @@ module Pages class DeleteService < BaseService def execute project.remove_pages - project.pages_domains.destroy_all # rubocop: disable DestroyAll + project.pages_domains.destroy_all # rubocop: disable Cop/DestroyAll end end end diff --git a/app/services/projects/move_deploy_keys_projects_service.rb b/app/services/projects/move_deploy_keys_projects_service.rb index 01419563538..51d84af249e 100644 --- a/app/services/projects/move_deploy_keys_projects_service.rb +++ b/app/services/projects/move_deploy_keys_projects_service.rb @@ -28,7 +28,7 @@ module Projects # rubocop: enable CodeReuse/ActiveRecord def remove_remaining_deploy_keys_projects - source_project.deploy_keys_projects.destroy_all # rubocop: disable DestroyAll + source_project.deploy_keys_projects.destroy_all # rubocop: disable Cop/DestroyAll end end end diff --git a/app/services/projects/move_lfs_objects_projects_service.rb b/app/services/projects/move_lfs_objects_projects_service.rb index 8cc420d7ba7..57a8d3d69c6 100644 --- a/app/services/projects/move_lfs_objects_projects_service.rb +++ b/app/services/projects/move_lfs_objects_projects_service.rb @@ -20,7 +20,7 @@ module Projects end def remove_remaining_lfs_objects_project - source_project.lfs_objects_projects.destroy_all # rubocop: disable DestroyAll + source_project.lfs_objects_projects.destroy_all # rubocop: disable Cop/DestroyAll end # rubocop: disable CodeReuse/ActiveRecord diff --git a/app/services/projects/move_notification_settings_service.rb b/app/services/projects/move_notification_settings_service.rb index 65a888fe26b..efe06f158cc 100644 --- a/app/services/projects/move_notification_settings_service.rb +++ b/app/services/projects/move_notification_settings_service.rb @@ -21,7 +21,7 @@ module Projects # Remove remaining notification settings from source_project def remove_remaining_notification_settings - source_project.notification_settings.destroy_all # rubocop: disable DestroyAll + source_project.notification_settings.destroy_all # rubocop: disable Cop/DestroyAll end # Get users of current notification_settings diff --git a/app/services/projects/move_project_group_links_service.rb b/app/services/projects/move_project_group_links_service.rb index d1aa9af2bcb..349953ff973 100644 --- a/app/services/projects/move_project_group_links_service.rb +++ b/app/services/projects/move_project_group_links_service.rb @@ -25,7 +25,7 @@ module Projects # Remove remaining project group links from source_project def remove_remaining_project_group_links - source_project.reset.project_group_links.destroy_all # rubocop: disable DestroyAll + source_project.reset.project_group_links.destroy_all # rubocop: disable Cop/DestroyAll end def group_links_in_target_project diff --git a/app/services/projects/move_project_members_service.rb b/app/services/projects/move_project_members_service.rb index de4e7e5a1e3..9a1b7c6d1b6 100644 --- a/app/services/projects/move_project_members_service.rb +++ b/app/services/projects/move_project_members_service.rb @@ -25,7 +25,7 @@ module Projects def remove_remaining_members # Remove remaining members and authorizations from source_project - source_project.project_members.destroy_all # rubocop: disable DestroyAll + source_project.project_members.destroy_all # rubocop: disable Cop/DestroyAll end def project_members_in_target_project diff --git a/app/services/protected_branches/legacy_api_update_service.rb b/app/services/protected_branches/legacy_api_update_service.rb index 65dc3297ae8..0cad23f20f7 100644 --- a/app/services/protected_branches/legacy_api_update_service.rb +++ b/app/services/protected_branches/legacy_api_update_service.rb @@ -39,11 +39,11 @@ module ProtectedBranches def delete_redundant_access_levels unless developers_can_merge.nil? - protected_branch.merge_access_levels.destroy_all # rubocop: disable DestroyAll + protected_branch.merge_access_levels.destroy_all # rubocop: disable Cop/DestroyAll end unless developers_can_push.nil? - protected_branch.push_access_levels.destroy_all # rubocop: disable DestroyAll + protected_branch.push_access_levels.destroy_all # rubocop: disable Cop/DestroyAll end end end diff --git a/app/services/snippets/bulk_destroy_service.rb b/app/services/snippets/bulk_destroy_service.rb index d9cc383a5a6..7056415f7cb 100644 --- a/app/services/snippets/bulk_destroy_service.rb +++ b/app/services/snippets/bulk_destroy_service.rb @@ -19,7 +19,7 @@ module Snippets user_can_delete_snippets! attempt_delete_repositories! - snippets.destroy_all # rubocop: disable DestroyAll + snippets.destroy_all # rubocop: disable Cop/DestroyAll ServiceResponse.success(message: 'Snippets were deleted.') rescue SnippetAccessError |