From efbf661c4224d481c57d0346e26983a805e5ec93 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 24 Apr 2023 15:15:38 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/layout/array_alignment.yml                 | 1 -
 .rubocop_todo/layout/first_array_element_indentation.yml | 1 -
 .rubocop_todo/layout/line_length.yml                     | 2 --
 .rubocop_todo/layout/space_in_lambda_literal.yml         | 1 -
 4 files changed, 5 deletions(-)

(limited to '.rubocop_todo/layout')

diff --git a/.rubocop_todo/layout/array_alignment.yml b/.rubocop_todo/layout/array_alignment.yml
index ef4e51b88da..893a9338c5b 100644
--- a/.rubocop_todo/layout/array_alignment.yml
+++ b/.rubocop_todo/layout/array_alignment.yml
@@ -4,7 +4,6 @@ Layout/ArrayAlignment:
   Details: grace period
   Exclude:
     - 'app/controllers/admin/application_settings_controller.rb'
-    - 'app/controllers/admin/broadcast_messages_controller.rb'
     - 'app/controllers/admin/plan_limits_controller.rb'
     - 'app/controllers/concerns/observability/content_security_policy.rb'
     - 'app/controllers/profiles_controller.rb'
diff --git a/.rubocop_todo/layout/first_array_element_indentation.yml b/.rubocop_todo/layout/first_array_element_indentation.yml
index e06a9a9d824..f55a4e6b0dc 100644
--- a/.rubocop_todo/layout/first_array_element_indentation.yml
+++ b/.rubocop_todo/layout/first_array_element_indentation.yml
@@ -3,7 +3,6 @@
 Layout/FirstArrayElementIndentation:
   Details: grace period
   Exclude:
-    - 'app/controllers/admin/broadcast_messages_controller.rb'
     - 'app/controllers/admin/plan_limits_controller.rb'
     - 'app/finders/user_groups_counter.rb'
     - 'app/helpers/search_helper.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index a0e12418711..a2cbf2b5b2d 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -3696,7 +3696,6 @@ Layout/LineLength:
     - 'spec/helpers/blob_helper_spec.rb'
     - 'spec/helpers/boards_helper_spec.rb'
     - 'spec/helpers/branches_helper_spec.rb'
-    - 'spec/helpers/broadcast_messages_helper_spec.rb'
     - 'spec/helpers/button_helper_spec.rb'
     - 'spec/helpers/ci/pipeline_editor_helper_spec.rb'
     - 'spec/helpers/clusters_helper_spec.rb'
@@ -4304,7 +4303,6 @@ Layout/LineLength:
     - 'spec/models/award_emoji_spec.rb'
     - 'spec/models/blob_viewer/go_mod_spec.rb'
     - 'spec/models/blob_viewer/metrics_dashboard_yml_spec.rb'
-    - 'spec/models/broadcast_message_spec.rb'
     - 'spec/models/bulk_import_spec.rb'
     - 'spec/models/bulk_imports/entity_spec.rb'
     - 'spec/models/bulk_imports/file_transfer/project_config_spec.rb'
diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml
index 9bfa99f6591..431e6e9fa72 100644
--- a/.rubocop_todo/layout/space_in_lambda_literal.yml
+++ b/.rubocop_todo/layout/space_in_lambda_literal.yml
@@ -392,7 +392,6 @@ Layout/SpaceInLambdaLiteral:
     - 'spec/lib/gitlab/sidekiq_signals_spec.rb'
     - 'spec/lib/gitlab/utils/sanitize_node_link_spec.rb'
     - 'spec/models/ability_spec.rb'
-    - 'spec/models/broadcast_message_spec.rb'
     - 'spec/models/concerns/participable_spec.rb'
     - 'spec/models/merge_request_spec.rb'
     - 'spec/support/shared_examples/lib/cache_helpers_shared_examples.rb'
-- 
cgit v1.2.1