Add latest changes from gitlab-org/gitlab@master

7 files changed, 1 insertions, 7 deletions

diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml
index 0ec0bc66869..4f5d5ab3a80 100644
--- a/.rubocop_todo/gitlab/namespaced_class.yml
+++ b/.rubocop_todo/gitlab/namespaced_class.yml
@@ -307,6 +307,7 @@ Gitlab/NamespacedClass:
     - 'app/models/service_desk_setting.rb'
     - 'app/models/service_list.rb'
     - 'app/models/shard.rb'
+    - 'app/models/slack_integration.rb'
     - 'app/models/snippet.rb'
     - 'app/models/snippet_blob.rb'
     - 'app/models/snippet_input_action.rb'
@@ -938,7 +939,6 @@ Gitlab/NamespacedClass:
     - 'ee/app/models/scim_identity.rb'
     - 'ee/app/models/scim_oauth_access_token.rb'
     - 'ee/app/models/scoped_label_set.rb'
-    - 'ee/app/models/slack_integration.rb'
     - 'ee/app/models/smartcard_identity.rb'
     - 'ee/app/models/software_license.rb'
     - 'ee/app/models/software_license_policy.rb'
diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 4fda4e8f2b6..b39f2181cee 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -1118,7 +1118,6 @@ Layout/ArgumentAlignment:
     - 'ee/app/models/scim_identity.rb'
     - 'ee/app/models/security/finding.rb'
     - 'ee/app/models/security/orchestration_policy_rule_schedule.rb'
-    - 'ee/app/models/slack_integration.rb'
     - 'ee/app/models/smartcard_identity.rb'
     - 'ee/app/models/status_page/project_setting.rb'
     - 'ee/app/models/vulnerabilities/external_issue_link.rb'
diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml
index 144b4eb04a7..7c914f47443 100644
--- a/.rubocop_todo/layout/space_in_lambda_literal.yml
+++ b/.rubocop_todo/layout/space_in_lambda_literal.yml
@@ -233,7 +233,6 @@ Layout/SpaceInLambdaLiteral:
     - 'ee/app/models/security/scan.rb'
     - 'ee/app/models/security/training.rb'
     - 'ee/app/models/security/training_provider.rb'
-    - 'ee/app/models/slack_integration.rb'
     - 'ee/app/models/software_license.rb'
     - 'ee/app/models/software_license_policy.rb'
     - 'ee/app/models/vulnerabilities/external_issue_link.rb'
diff --git a/.rubocop_todo/lint/unused_block_argument.yml b/.rubocop_todo/lint/unused_block_argument.yml
index c09dc939ef4..263cbf9e424 100644
--- a/.rubocop_todo/lint/unused_block_argument.yml
+++ b/.rubocop_todo/lint/unused_block_argument.yml
@@ -135,7 +135,6 @@ Lint/UnusedBlockArgument:
     - 'ee/spec/factories/projects.rb'
     - 'ee/spec/factories/protected_branches.rb'
     - 'ee/spec/factories/protected_environments.rb'
-    - 'ee/spec/factories/slack_integrations.rb'
     - 'ee/spec/factories/users.rb'
     - 'ee/spec/features/groups/group_settings_spec.rb'
     - 'ee/spec/graphql/mutations/dast/profiles/update_spec.rb'
diff --git a/.rubocop_todo/rails/inverse_of.yml b/.rubocop_todo/rails/inverse_of.yml
index de45a47fed6..412d28a11da 100644
--- a/.rubocop_todo/rails/inverse_of.yml
+++ b/.rubocop_todo/rails/inverse_of.yml
@@ -76,7 +76,6 @@ Rails/InverseOf:
     - 'ee/app/models/incident_management/escalation_rule.rb'
     - 'ee/app/models/incident_management/oncall_participant.rb'
     - 'ee/app/models/insight.rb'
-    - 'ee/app/models/integrations/gitlab_slack_application.rb'
     - 'ee/app/models/iteration.rb'
     - 'ee/app/models/requirements_management/requirement.rb'
     - 'ee/app/models/requirements_management/test_report.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index c94541ad8a2..56d617368af 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -1035,7 +1035,6 @@ RSpec/MissingFeatureCategory:
     - 'ee/spec/lib/quality/seeders/vulnerabilities_spec.rb'
     - 'ee/spec/lib/sidebars/groups/menus/analytics_menu_spec.rb'
     - 'ee/spec/lib/sidebars/groups/menus/security_compliance_menu_spec.rb'
-    - 'ee/spec/lib/slack/api_spec.rb'
     - 'ee/spec/lib/slack/block_kit/app_home_opened_spec.rb'
     - 'ee/spec/lib/slack/block_kit/incident_management/incident_modal_opened_spec.rb'
     - 'ee/spec/lib/system_check/app/search_check_spec.rb'
diff --git a/.rubocop_todo/style/numbered_parameters.yml b/.rubocop_todo/style/numbered_parameters.yml
index 3251cc0bcad..aa3df93ab8f 100644
--- a/.rubocop_todo/style/numbered_parameters.yml
+++ b/.rubocop_todo/style/numbered_parameters.yml
@@ -25,7 +25,6 @@ Style/NumberedParameters:
     - 'app/services/web_hooks/log_execution_service.rb'
     - 'ee/app/models/ee/project.rb'
     - 'ee/app/models/security/finding.rb'
-    - 'ee/app/models/slack_integration.rb'
     - 'ee/app/models/vulnerabilities/feedback.rb'
     - 'ee/app/services/security/ingestion/tasks/hooks_execution.rb'
     - 'ee/app/services/security/ingestion/tasks/ingest_remediations.rb'