Add latest changes from gitlab-org/gitlab@master

4 files changed, 0 insertions, 7 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index c813b997f3f..e5782ffe593 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -1496,7 +1496,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/features/search/elastic/global_search_spec.rb'
     - 'ee/spec/features/search/elastic/group_search_spec.rb'
     - 'ee/spec/features/security/project/discover_spec.rb'
-    - 'ee/spec/features/uncompleted_learn_gitlab_link_spec.rb'
     - 'ee/spec/features/users/identity_verification_spec.rb'
     - 'ee/spec/finders/boards/milestones_finder_spec.rb'
     - 'ee/spec/finders/epics/cross_hierarchy_ancestors_finder_spec.rb'
diff --git a/.rubocop_todo/layout/line_continuation_leading_space.yml b/.rubocop_todo/layout/line_continuation_leading_space.yml
index 14ab2e15857..a4b23536a70 100644
--- a/.rubocop_todo/layout/line_continuation_leading_space.yml
+++ b/.rubocop_todo/layout/line_continuation_leading_space.yml
@@ -52,7 +52,6 @@ Layout/LineContinuationLeadingSpace:
     - 'rubocop/cop/migration/update_column_in_batches.rb'
     - 'scripts/lib/glfm/parse_examples.rb'
     - 'scripts/qa/testcases-check'
-    - 'spec/features/groups/show_spec.rb'
     - 'spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb'
     - 'spec/lib/gitlab/ci/ansi2html_spec.rb'
     - 'spec/lib/gitlab/ci/parsers/sbom/validators/cyclonedx_schema_validator_spec.rb'
diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
index 319dd967481..ff2857f22a8 100644
--- a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
+++ b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
@@ -262,7 +262,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'spec/contracts/provider_specs/helpers/provider/contract_source_helper_spec.rb'
     - 'spec/controllers/graphql_controller_spec.rb'
     - 'spec/controllers/projects/deploy_keys_controller_spec.rb'
-    - 'spec/features/groups/show_spec.rb'
     - 'spec/features/projects/files/user_browses_files_spec.rb'
     - 'spec/features/projects/files/user_creates_directory_spec.rb'
     - 'spec/features/projects/files/user_creates_files_spec.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 24da1ae2101..e9075082d02 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1623,7 +1623,6 @@ Layout/LineLength:
     - 'ee/spec/features/invites_spec.rb'
     - 'ee/spec/features/issues/filtered_search/filter_issues_weight_spec.rb'
     - 'ee/spec/features/issues/form_spec.rb'
-    - 'ee/spec/features/issues/issue_sidebar_spec.rb'
     - 'ee/spec/features/labels_hierarchy_spec.rb'
     - 'ee/spec/features/merge_request/user_approves_spec.rb'
     - 'ee/spec/features/merge_request/user_approves_with_password_spec.rb'
@@ -3630,7 +3629,6 @@ Layout/LineLength:
     - 'spec/features/merge_request/user_comments_on_diff_spec.rb'
     - 'spec/features/merge_request/user_creates_image_diff_notes_spec.rb'
     - 'spec/features/merge_request/user_creates_merge_request_spec.rb'
-    - 'spec/features/merge_request/user_edits_assignees_sidebar_spec.rb'
     - 'spec/features/merge_request/user_expands_diff_spec.rb'
     - 'spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb'
     - 'spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb'
@@ -3925,7 +3923,6 @@ Layout/LineLength:
     - 'spec/helpers/markup_helper_spec.rb'
     - 'spec/helpers/members_helper_spec.rb'
     - 'spec/helpers/namespaces_helper_spec.rb'
-    - 'spec/helpers/nav/new_dropdown_helper_spec.rb'
     - 'spec/helpers/notes_helper_spec.rb'
     - 'spec/helpers/operations_helper_spec.rb'
     - 'spec/helpers/profiles_helper_spec.rb'
@@ -3935,7 +3932,6 @@ Layout/LineLength:
     - 'spec/helpers/projects_helper_spec.rb'
     - 'spec/helpers/registrations_helper_spec.rb'
     - 'spec/helpers/search_helper_spec.rb'
-    - 'spec/helpers/sidebars_helper_spec.rb'
     - 'spec/helpers/sidekiq_helper_spec.rb'
     - 'spec/helpers/snippets_helper_spec.rb'
     - 'spec/helpers/sorting_helper_spec.rb'