Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 39 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 66d5737ab9c..826e20fb40f 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -1034,21 +1034,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index_spec.rb'
     - 'ee/spec/elastic/migrate/20221124090600_add_namespace_ancestry_ids_to_original_index_mapping_spec.rb'
     - 'ee/spec/elastic/migrate/20221221110300_backfill_traversal_ids_to_blobs_and_wiki_blobs_spec.rb'
-    - 'ee/spec/features/account_recovery_regular_check_spec.rb'
-    - 'ee/spec/features/admin/admin_emails_spec.rb'
-    - 'ee/spec/features/admin/admin_settings_spec.rb'
-    - 'ee/spec/features/billings/billing_plans_spec.rb'
-    - 'ee/spec/features/boards/boards_spec.rb'
-    - 'ee/spec/features/boards/swimlanes/epics_swimlanes_drag_drop_spec.rb'
-    - 'ee/spec/features/burndown_charts_spec.rb'
-    - 'ee/spec/features/dashboards/todos_spec.rb'
-    - 'ee/spec/features/epic_boards/epic_boards_spec.rb'
-    - 'ee/spec/features/groups/saml_enforcement_spec.rb'
-    - 'ee/spec/features/groups/settings/domain_verification_spec.rb'
-    - 'ee/spec/features/groups/settings/protected_environments_spec.rb'
-    - 'ee/spec/features/groups/usage_quotas/pipelines_tab_spec.rb'
-    - 'ee/spec/features/markdown/metrics_spec.rb'
-    - 'ee/spec/features/merge_request/user_sees_approval_widget_spec.rb'
     - 'ee/spec/features/namespace_user_cap_reached_alert_spec.rb'
     - 'ee/spec/features/projects/environments/environment_spec.rb'
     - 'ee/spec/features/projects/environments/environments_spec.rb'
@@ -1120,7 +1105,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/lib/ee/gitlab/scim/provisioning_service_spec.rb'
     - 'ee/spec/lib/ee/gitlab/usage/service_ping_report_spec.rb'
     - 'ee/spec/lib/ee/gitlab/usage_data_spec.rb'
-    - 'ee/spec/lib/elastic/latest/project_wiki_class_proxy_spec.rb'
     - 'ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb'
     - 'ee/spec/lib/gitlab/analytics/cycle_analytics/distinct_stage_loader_spec.rb'
     - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/stage_time_summary_spec.rb'
@@ -1610,23 +1594,6 @@ Layout/ArgumentAlignment:
     - 'spec/features/projects/pipelines/pipeline_spec.rb'
     - 'spec/features/projects/pipelines/pipelines_spec.rb'
     - 'spec/features/projects/releases/user_views_release_spec.rb'
-    - 'spec/features/projects/settings/external_authorization_service_settings_spec.rb'
-    - 'spec/features/projects/settings/monitor_settings_spec.rb'
-    - 'spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb'
-    - 'spec/features/projects/settings/registry_settings_spec.rb'
-    - 'spec/features/projects/show/download_buttons_spec.rb'
-    - 'spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb'
-    - 'spec/features/projects/tags/download_buttons_spec.rb'
-    - 'spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb'
-    - 'spec/features/search/user_searches_for_milestones_spec.rb'
-    - 'spec/features/search/user_searches_for_wiki_pages_spec.rb'
-    - 'spec/features/snippets/spam_snippets_spec.rb'
-    - 'spec/features/snippets/user_creates_snippet_spec.rb'
-    - 'spec/features/task_lists_spec.rb'
-    - 'spec/features/user_sees_revert_modal_spec.rb'
-    - 'spec/features/users/email_verification_on_login_spec.rb'
-    - 'spec/features/users/login_spec.rb'
-    - 'spec/features/users/overview_spec.rb'
     - 'spec/frontend/fixtures/autocomplete.rb'
     - 'spec/frontend/fixtures/autocomplete_sources.rb'
     - 'spec/frontend/fixtures/environments.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 4d635a3071c..e3829a97b02 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -723,8 +723,6 @@ RSpec/MissingFeatureCategory:
     - 'ee/spec/lib/elastic/latest/issue_config_spec.rb'
     - 'ee/spec/lib/elastic/latest/merge_request_config_spec.rb'
     - 'ee/spec/lib/elastic/latest/note_config_spec.rb'
-    - 'ee/spec/lib/elastic/latest/project_wiki_class_proxy_spec.rb'
-    - 'ee/spec/lib/elastic/latest/project_wiki_instance_proxy_spec.rb'
     - 'ee/spec/lib/elastic/latest/routing_spec.rb'
     - 'ee/spec/lib/elastic/latest/snippet_instance_proxy_spec.rb'
     - 'ee/spec/lib/elastic/latest/user_config_spec.rb'
diff --git a/.rubocop_todo/search/namespaced_class.yml b/.rubocop_todo/search/namespaced_class.yml
index ba2dbafb3c7..71067dd4e1c 100644
--- a/.rubocop_todo/search/namespaced_class.yml
+++ b/.rubocop_todo/search/namespaced_class.yml
@@ -108,8 +108,6 @@ Search/NamespacedClass:
     - 'ee/lib/elastic/latest/note_instance_proxy.rb'
     - 'ee/lib/elastic/latest/project_class_proxy.rb'
     - 'ee/lib/elastic/latest/project_instance_proxy.rb'
-    - 'ee/lib/elastic/latest/project_wiki_class_proxy.rb'
-    - 'ee/lib/elastic/latest/project_wiki_instance_proxy.rb'
     - 'ee/lib/elastic/latest/query_context.rb'
     - 'ee/lib/elastic/latest/repository_class_proxy.rb'
     - 'ee/lib/elastic/latest/repository_instance_proxy.rb'
@@ -142,8 +140,6 @@ Search/NamespacedClass:
     - 'ee/lib/elastic/v12p1/note_instance_proxy.rb'
     - 'ee/lib/elastic/v12p1/project_class_proxy.rb'
     - 'ee/lib/elastic/v12p1/project_instance_proxy.rb'
-    - 'ee/lib/elastic/v12p1/project_wiki_class_proxy.rb'
-    - 'ee/lib/elastic/v12p1/project_wiki_instance_proxy.rb'
     - 'ee/lib/elastic/v12p1/repository_class_proxy.rb'
     - 'ee/lib/elastic/v12p1/repository_instance_proxy.rb'
     - 'ee/lib/elastic/v12p1/routing.rb'