Add latest changes from gitlab-org/gitlab@master

6 files changed, 0 insertions, 6 deletions

diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index d29aedff63f..a0df088b088 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -800,7 +800,6 @@ RSpec/ContextWording:
     - 'ee/spec/services/projects/operations/update_service_spec.rb'
     - 'ee/spec/services/projects/protect_default_branch_service_spec.rb'
     - 'ee/spec/services/projects/restore_service_spec.rb'
-    - 'ee/spec/services/projects/slack_application_install_service_spec.rb'
     - 'ee/spec/services/projects/transfer_service_spec.rb'
     - 'ee/spec/services/projects/update_mirror_service_spec.rb'
     - 'ee/spec/services/projects/update_service_spec.rb'
diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml
index ceeffd1f098..4b588f265c9 100644
--- a/.rubocop_todo/rspec/expect_in_hook.yml
+++ b/.rubocop_todo/rspec/expect_in_hook.yml
@@ -4,7 +4,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/controllers/ee/projects/merge_requests/content_controller_spec.rb'
     - 'ee/spec/controllers/groups/analytics/productivity_analytics_controller_spec.rb'
     - 'ee/spec/controllers/groups/seat_usage_controller_spec.rb'
-    - 'ee/spec/controllers/projects/settings/slacks_controller_spec.rb'
     - 'ee/spec/controllers/subscriptions_controller_spec.rb'
     - 'ee/spec/elastic/migrate/20220118150500_delete_orphaned_commits_spec.rb'
     - 'ee/spec/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index_spec.rb'
diff --git a/.rubocop_todo/style/class_and_module_children.yml b/.rubocop_todo/style/class_and_module_children.yml
index 4257adbdc6f..81b154f906b 100644
--- a/.rubocop_todo/style/class_and_module_children.yml
+++ b/.rubocop_todo/style/class_and_module_children.yml
@@ -412,7 +412,6 @@ Style/ClassAndModuleChildren:
     - 'ee/app/controllers/groups/wikis_controller.rb'
     - 'ee/app/controllers/oauth/geo_auth_controller.rb'
     - 'ee/app/controllers/profiles/billings_controller.rb'
-    - 'ee/app/controllers/profiles/slacks_controller.rb'
     - 'ee/app/controllers/projects/analytics/issues_analytics_controller.rb'
     - 'ee/app/controllers/projects/analytics/merge_request_analytics_controller.rb'
     - 'ee/app/controllers/projects/approver_groups_controller.rb'
diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml
index adf3e8ee9b2..184e0d926d5 100644
--- a/.rubocop_todo/style/empty_method.yml
+++ b/.rubocop_todo/style/empty_method.yml
@@ -94,7 +94,6 @@ Style/EmptyMethod:
     - 'ee/app/controllers/projects/security/dast_scanner_profiles_controller.rb'
     - 'ee/app/controllers/projects/security/dast_site_profiles_controller.rb'
     - 'ee/app/controllers/projects/security/sast_configuration_controller.rb'
-    - 'ee/app/controllers/projects/settings/slacks_controller.rb'
     - 'ee/app/controllers/subscriptions/groups_controller.rb'
     - 'ee/app/models/ee/epic.rb'
     - 'ee/app/services/feature_flag_issues/destroy_service.rb'
diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 10d4a22876a..4fcefa6ef85 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -274,7 +274,6 @@ Style/GuardClause:
     - 'ee/app/controllers/profiles/billings_controller.rb'
     - 'ee/app/controllers/projects/path_locks_controller.rb'
     - 'ee/app/controllers/projects/security/policies_controller.rb'
-    - 'ee/app/controllers/projects/settings/slacks_controller.rb'
     - 'ee/app/controllers/smartcard_controller.rb'
     - 'ee/app/finders/ee/template_finder.rb'
     - 'ee/app/finders/iterations_finder.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index 78e27951786..9fdfb6c960d 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -411,7 +411,6 @@ Style/IfUnlessModifier:
     - 'ee/app/controllers/projects/integrations/zentao/issues_controller.rb'
     - 'ee/app/controllers/projects/path_locks_controller.rb'
     - 'ee/app/controllers/projects/push_rules_controller.rb'
-    - 'ee/app/controllers/projects/settings/slacks_controller.rb'
     - 'ee/app/finders/security/pipeline_vulnerabilities_finder.rb'
     - 'ee/app/finders/security/vulnerabilities_finder.rb'
     - 'ee/app/graphql/mutations/audit_events/external_audit_event_destinations/create.rb'