Add latest changes from gitlab-org/gitlab@master

5 files changed, 0 insertions, 7 deletions

diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 91c47aad503..16b3419ef02 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -38,7 +38,6 @@ Layout/LineLength:
     - 'app/controllers/groups/group_members_controller.rb'
     - 'app/controllers/groups/settings/applications_controller.rb'
     - 'app/controllers/groups/settings/ci_cd_controller.rb'
-    - 'app/controllers/groups/settings/integrations_controller.rb'
     - 'app/controllers/groups/settings/repository_controller.rb'
     - 'app/controllers/groups_controller.rb'
     - 'app/controllers/import/base_controller.rb'
diff --git a/.rubocop_todo/rails/lexically_scoped_action_filter.yml b/.rubocop_todo/rails/lexically_scoped_action_filter.yml
index 1620fbd39b7..282b6ead10e 100644
--- a/.rubocop_todo/rails/lexically_scoped_action_filter.yml
+++ b/.rubocop_todo/rails/lexically_scoped_action_filter.yml
@@ -7,7 +7,6 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/clusters/base_controller.rb'
     - 'app/controllers/clusters/clusters_controller.rb'
     - 'app/controllers/concerns/enforces_two_factor_authentication.rb'
-    - 'app/controllers/concerns/integrations/actions.rb'
     - 'app/controllers/concerns/oauth_applications.rb'
     - 'app/controllers/concerns/spammable_actions/captcha_check/html_format_actions_support.rb'
     - 'app/controllers/confirmations_controller.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 515ac988cc2..54b40a045a7 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -972,7 +972,6 @@ RSpec/ContextWording:
     - 'spec/config/object_store_settings_spec.rb'
     - 'spec/controllers/admin/application_settings_controller_spec.rb'
     - 'spec/controllers/admin/instance_review_controller_spec.rb'
-    - 'spec/controllers/admin/integrations_controller_spec.rb'
     - 'spec/controllers/admin/sessions_controller_spec.rb'
     - 'spec/controllers/admin/users_controller_spec.rb'
     - 'spec/controllers/application_controller_spec.rb'
@@ -1004,7 +1003,6 @@ RSpec/ContextWording:
     - 'spec/controllers/groups/registry/repositories_controller_spec.rb'
     - 'spec/controllers/groups/releases_controller_spec.rb'
     - 'spec/controllers/groups/settings/ci_cd_controller_spec.rb'
-    - 'spec/controllers/groups/settings/integrations_controller_spec.rb'
     - 'spec/controllers/groups/settings/repository_controller_spec.rb'
     - 'spec/controllers/groups_controller_spec.rb'
     - 'spec/controllers/help_controller_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 992295c1bcb..b4533feec23 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -1638,7 +1638,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/controllers/admin/hooks_controller_spec.rb'
     - 'spec/controllers/admin/identities_controller_spec.rb'
     - 'spec/controllers/admin/impersonations_controller_spec.rb'
-    - 'spec/controllers/admin/integrations_controller_spec.rb'
     - 'spec/controllers/admin/jobs_controller_spec.rb'
     - 'spec/controllers/admin/plan_limits_controller_spec.rb'
     - 'spec/controllers/admin/projects_controller_spec.rb'
@@ -1701,7 +1700,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/controllers/groups/releases_controller_spec.rb'
     - 'spec/controllers/groups/settings/applications_controller_spec.rb'
     - 'spec/controllers/groups/settings/ci_cd_controller_spec.rb'
-    - 'spec/controllers/groups/settings/integrations_controller_spec.rb'
     - 'spec/controllers/groups/settings/repository_controller_spec.rb'
     - 'spec/controllers/groups/shared_projects_controller_spec.rb'
     - 'spec/controllers/groups/uploads_controller_spec.rb'
diff --git a/.rubocop_todo/rspec/return_from_stub.yml b/.rubocop_todo/rspec/return_from_stub.yml
index da4c41e2f6d..20e4112da62 100644
--- a/.rubocop_todo/rspec/return_from_stub.yml
+++ b/.rubocop_todo/rspec/return_from_stub.yml
@@ -79,7 +79,6 @@ RSpec/ReturnFromStub:
     - 'spec/bin/feature_flag_spec.rb'
     - 'spec/config/settings_spec.rb'
     - 'spec/controllers/admin/application_settings_controller_spec.rb'
-    - 'spec/controllers/admin/integrations_controller_spec.rb'
     - 'spec/controllers/concerns/page_limiter_spec.rb'
     - 'spec/controllers/concerns/send_file_upload_spec.rb'
     - 'spec/controllers/concerns/spammable_actions/akismet_mark_as_spam_action_spec.rb'