Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 37 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 289b732e958..be389f5bb36 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -628,13 +628,6 @@ Layout/ArgumentAlignment:
     - 'app/services/pages/migrate_from_legacy_storage_service.rb'
     - 'app/services/post_receive_service.rb'
     - 'app/services/preview_markdown_service.rb'
-    - 'app/services/projects/create_service.rb'
-    - 'app/services/projects/fork_service.rb'
-    - 'app/services/projects/hashed_storage/base_repository_service.rb'
-    - 'app/services/projects/import_service.rb'
-    - 'app/services/projects/lfs_pointers/lfs_download_link_list_service.rb'
-    - 'app/services/projects/overwrite_project_service.rb'
-    - 'app/services/projects/update_remote_mirror_service.rb'
     - 'app/services/protected_branches/api_service.rb'
     - 'app/services/protected_branches/legacy_api_create_service.rb'
     - 'app/services/quick_actions/interpret_service.rb'
@@ -1598,10 +1591,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/services/issue_feature_flags/list_service_spec.rb'
     - 'ee/spec/services/merge_request_approval_settings/update_service_spec.rb'
     - 'ee/spec/services/merge_requests/build_service_spec.rb'
-    - 'ee/spec/services/projects/create_service_spec.rb'
-    - 'ee/spec/services/projects/gitlab_projects_import_service_spec.rb'
-    - 'ee/spec/services/projects/prometheus/alerts/notify_service_spec.rb'
-    - 'ee/spec/services/projects/restore_service_spec.rb'
     - 'ee/spec/services/protected_environments/create_service_spec.rb'
     - 'ee/spec/services/protected_environments/update_service_spec.rb'
     - 'ee/spec/services/quick_actions/interpret_service_spec.rb'
@@ -2694,23 +2683,6 @@ Layout/ArgumentAlignment:
     - 'spec/services/pages/migrate_legacy_storage_to_deployment_service_spec.rb'
     - 'spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb'
     - 'spec/services/preview_markdown_service_spec.rb'
-    - 'spec/services/projects/all_merge_requests_count_service_spec.rb'
-    - 'spec/services/projects/container_repository/gitlab/cleanup_tags_service_spec.rb'
-    - 'spec/services/projects/container_repository/third_party/cleanup_tags_service_spec.rb'
-    - 'spec/services/projects/create_service_spec.rb'
-    - 'spec/services/projects/destroy_service_spec.rb'
-    - 'spec/services/projects/fork_service_spec.rb'
-    - 'spec/services/projects/group_links/create_service_spec.rb'
-    - 'spec/services/projects/group_links/destroy_service_spec.rb'
-    - 'spec/services/projects/group_links/update_service_spec.rb'
-    - 'spec/services/projects/hashed_storage/migration_service_spec.rb'
-    - 'spec/services/projects/lfs_pointers/lfs_link_service_spec.rb'
-    - 'spec/services/projects/open_merge_requests_count_service_spec.rb'
-    - 'spec/services/projects/prometheus/alerts/notify_service_spec.rb'
-    - 'spec/services/projects/transfer_service_spec.rb'
-    - 'spec/services/projects/unlink_fork_service_spec.rb'
-    - 'spec/services/projects/update_pages_service_spec.rb'
-    - 'spec/services/projects/update_service_spec.rb'
     - 'spec/services/protected_branches/api_service_spec.rb'
     - 'spec/services/push_event_payload_service_spec.rb'
     - 'spec/services/quick_actions/interpret_service_spec.rb'
@@ -2743,7 +2715,6 @@ Layout/ArgumentAlignment:
     - 'spec/support/shared_contexts/merge_request_edit_shared_context.rb'
     - 'spec/support/shared_contexts/merge_requests_allowing_collaboration_shared_context.rb'
     - 'spec/support/shared_contexts/requests/api/graphql/releases_and_group_releases_shared_context.rb'
-    - 'spec/support/shared_contexts/services/projects/container_repository/delete_tags_service_shared_context.rb'
     - 'spec/support/shared_examples/controllers/snippets_sort_order_shared_examples.rb'
     - 'spec/support/shared_examples/controllers/wiki_actions_shared_examples.rb'
     - 'spec/support/shared_examples/features/search/redacted_search_results_shared_examples.rb'
diff --git a/.rubocop_todo/naming/inclusive_language.yml b/.rubocop_todo/naming/inclusive_language.yml
index 953e1a6e508..465e338bbe7 100644
--- a/.rubocop_todo/naming/inclusive_language.yml
+++ b/.rubocop_todo/naming/inclusive_language.yml
@@ -1,9 +1,7 @@
 ---
 Naming/InclusiveLanguage:
-  Details: grace period
   Exclude:
     - 'app/controllers/admin/application_settings/appearances_controller.rb'
-    - 'app/controllers/application_controller.rb'
     - 'app/controllers/concerns/requires_whitelisted_monitoring_client.rb'
     - 'app/controllers/health_check_controller.rb'
     - 'app/controllers/health_controller.rb'
@@ -13,7 +11,6 @@ Naming/InclusiveLanguage:
     - 'app/helpers/markup_helper.rb'
     - 'app/models/application_setting.rb'
     - 'app/models/application_setting_implementation.rb'
-    - 'app/models/clusters/applications/jupyter.rb'
     - 'app/models/concerns/cache_markdown_field.rb'
     - 'app/services/application_settings/update_service.rb'
     - 'app/services/projects/download_service.rb'
@@ -37,7 +34,6 @@ Naming/InclusiveLanguage:
     - 'lib/api/settings.rb'
     - 'lib/banzai/filter/asset_proxy_filter.rb'
     - 'lib/gitlab/asset_proxy.rb'
-    - 'lib/gitlab/auth.rb'
     - 'lib/gitlab/auth/ip_rate_limiter.rb'
     - 'lib/gitlab/ci/config/external/file/base.rb'
     - 'lib/gitlab/git/hook_env.rb'
@@ -45,7 +41,6 @@ Naming/InclusiveLanguage:
     - 'lib/gitlab/markdown_cache/active_record/extension.rb'
     - 'lib/gitlab/markdown_cache/field_data.rb'
     - 'lib/gitlab/middleware/basic_health_check.rb'
-    - 'lib/gitlab/middleware/go.rb'
     - 'lib/gitlab/sanitizers/exif.rb'
     - 'lib/gitlab/sanitizers/svg.rb'
     - 'lib/gitlab/sanitizers/svg/whitelist.rb'
@@ -61,7 +56,6 @@ Naming/InclusiveLanguage:
     - 'rubocop/cop/ignored_columns.rb'
     - 'rubocop/cop/inject_enterprise_edition_module.rb'
     - 'rubocop/cop/migration/add_columns_to_wide_tables.rb'
-    - 'spec/controllers/application_controller_spec.rb'
     - 'spec/controllers/concerns/issuable_collections_spec.rb'
     - 'spec/controllers/health_check_controller_spec.rb'
     - 'spec/controllers/metrics_controller_spec.rb'
@@ -70,7 +64,6 @@ Naming/InclusiveLanguage:
     - 'spec/lib/banzai/filter/asset_proxy_filter_spec.rb'
     - 'spec/lib/gitlab/asset_proxy_spec.rb'
     - 'spec/lib/gitlab/auth/ip_rate_limiter_spec.rb'
-    - 'spec/lib/gitlab/auth_spec.rb'
     - 'spec/lib/gitlab/git/hook_env_spec.rb'
     - 'spec/lib/gitlab/github_import/markdown/attachment_spec.rb'
     - 'spec/lib/gitlab/import_export/attribute_configuration_spec.rb'
@@ -81,7 +74,6 @@ Naming/InclusiveLanguage:
     - 'spec/lib/gitlab/sanitizers/exif_spec.rb'
     - 'spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb'
     - 'spec/models/application_setting_spec.rb'
-    - 'spec/models/clusters/applications/jupyter_spec.rb'
     - 'spec/requests/api/settings_spec.rb'
     - 'spec/requests/health_controller_spec.rb'
     - 'spec/rubocop/cop/avoid_return_from_blocks_spec.rb'
diff --git a/.rubocop_todo/rspec/shared_groups_metadata.yml b/.rubocop_todo/rspec/shared_groups_metadata.yml
new file mode 100644
index 00000000000..a9e4e6defec
--- /dev/null
+++ b/.rubocop_todo/rspec/shared_groups_metadata.yml
@@ -0,0 +1,9 @@
+---
+RSpec/SharedGroupsMetadata:
+  Details: grace period
+  Exclude:
+    - 'ee/spec/requests/ee/admin/plan_limits_controller_spec.rb'
+    - 'ee/spec/support/shared_contexts/saas_registration_settings_context.rb'
+    - 'spec/lib/gitlab/ci/config/entry/retry_spec.rb'
+    - 'spec/lib/gitlab/git/merge_base_spec.rb'
+    - 'spec/models/container_repository_spec.rb'