.gitignore

@@ -53,7 +53,6 @@ eslint-report.html
 /db/data.yml
 /doc/code/*
 /dump.rdb
-/glfm_specification/input/github_flavored_markdown/ghfm_spec_v_*.txt
 /jsconfig.json
 /lefthook-local.yml
 /log/*.log*

.gitlab/CODEOWNERS

@@ -248,15 +248,17 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/administration/object_storage.md @axil
 /doc/administration/operations/ @axil
 /doc/administration/operations/moving_repositories.md @eread
+/doc/administration/operations/fast_ssh_key_lookup.md @aqualls
 /doc/administration/operations/sidekiq_memory_killer.md @sselhorn
 /doc/administration/package_information/ @axil
 /doc/administration/packages/ @claytoncornell
 /doc/administration/pages/index.md @aqualls
 /doc/administration/pages/source.md @aqualls
 /doc/administration/polling.md @axil
-/doc/administration/postgresql/ @sselhorn
+/doc/administration/postgresql/ @aqualls
 /doc/administration/pseudonymizer.md @axil
 /doc/administration/raketasks/ @axil
+/doc/administration/raketasks/ldap.md @eread
 /doc/administration/raketasks/praefect.md @eread
 /doc/administration/read_only_gitlab.md @axil
 /doc/administration/redis/ @axil
@@ -277,8 +279,9 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/administration/terraform_state.md @sselhorn
 /doc/administration/timezone.md @axil
 /doc/administration/troubleshooting/ @axil
-/doc/administration/troubleshooting/elasticsearch.md @rdickenson
-/doc/administration/troubleshooting/postgresql.md @sselhorn
+/doc/administration/troubleshooting/elasticsearch.md @sselhorn
+/doc/administration/troubleshooting/group_saml_scim.md @eread
+/doc/administration/troubleshooting/postgresql.md @aqualls
 /doc/administration/uploads.md @axil
 /doc/administration/user_settings.md @eread
 /doc/administration/whats-new.md @kpaizee
@@ -437,7 +440,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/api/vulnerability_findings.md @claytoncornell
 /doc/api/wikis.md @aqualls
 /doc/architecture/blueprints/container_registry_metadata_database/index.md @claytoncornell
-/doc/architecture/blueprints/database/scalability/patterns/ @sselhorn
+/doc/architecture/blueprints/database/scalability/patterns/ @aqualls
 /doc/architecture/blueprints/gitlab_to_kubernetes_communication/index.md @sselhorn
 /doc/ci/caching/index.md @marcel.amirault
 /doc/ci/chatops/index.md @sselhorn
@@ -479,6 +482,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/ci/review_apps/index.md @marcel.amirault
 /doc/ci/runners/ @sselhorn
 /doc/ci/secrets/index.md @marcel.amirault
+/doc/ci/secure_files/index.md @marcel.amirault
 /doc/ci/services/ @sselhorn
 /doc/ci/ssh_keys/index.md @marcel.amirault
 /doc/ci/test_cases/index.md @msedlakjakubowski
@@ -487,14 +491,13 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/ci/unit_test_reports.md @marcel.amirault
 /doc/ci/variables/ @marcel.amirault
 /doc/ci/yaml/ @marcel.amirault
-/doc/development/adding_database_indexes.md @sselhorn
+/doc/development/adding_database_indexes.md @aqualls
 /doc/development/application_limits.md @axil
 /doc/development/approval_rules.md @aqualls
 /doc/development/audit_event_guide/index.md @eread
 /doc/development/auto_devops.md @sselhorn
-/doc/development/backend/create_source_code_be/index.md @aqualls
+/doc/development/backend/create_source_code_be/ @aqualls
 /doc/development/backend/ruby_style_guide.md @sselhorn
-/doc/development/batched_background_migrations.md @sselhorn
 /doc/development/build_test_package.md @axil
 /doc/development/bulk_import.md @eread
 /doc/development/cached_queries.md @sselhorn
@@ -507,23 +510,19 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/development/code_intelligence/index.md @aqualls
 /doc/development/contributing/ @sselhorn
 /doc/development/contributing/merge_request_workflow.md @aqualls
-/doc/development/creating_enums.md @sselhorn
-/doc/development/database_debugging.md @sselhorn
-/doc/development/database_query_comments.md @sselhorn
-/doc/development/database_review.md @sselhorn
-/doc/development/database/ @sselhorn
-/doc/development/database/multiple_databases.md @sselhorn
-/doc/development/db_dump.md @sselhorn
+/doc/development/creating_enums.md @aqualls
+/doc/development/database_debugging.md @aqualls
+/doc/development/database_query_comments.md @aqualls
+/doc/development/database_review.md @aqualls
+/doc/development/database/ @aqualls
+/doc/development/db_dump.md @aqualls
 /doc/development/developing_with_solargraph.md @aqualls
 /doc/development/diffs.md @aqualls
 /doc/development/distributed_tracing.md @msedlakjakubowski
-/doc/development/documentation/feature_flags.md @sselhorn
-/doc/development/documentation/graphql_styleguide.md @sselhorn
+/doc/development/documentation/ @sselhorn
 /doc/development/documentation/index.md @dianalogan
 /doc/development/documentation/redirects.md @dianalogan
 /doc/development/documentation/review_apps.md @dianalogan
-/doc/development/documentation/structure.md @sselhorn
-/doc/development/documentation/styleguide/ @sselhorn
 /doc/development/documentation/testing.md @dianalogan
 /doc/development/elasticsearch.md @sselhorn
 /doc/development/experiment_guide/gitlab_experiment.md @kpaizee
@@ -537,19 +536,21 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/development/feature_flags/controls.md @sselhorn
 /doc/development/feature_flags/index.md @sselhorn
 /doc/development/filtering_by_label.md @msedlakjakubowski
-/doc/development/foreign_keys.md @sselhorn
+/doc/development/foreign_keys.md @aqualls
 /doc/development/geo.md @axil
 /doc/development/geo/framework.md @axil
 /doc/development/git_object_deduplication.md @eread
 /doc/development/gitaly.md @eread
+/doc/development/gitlab_flavored_markdown/index.md @aqualls
+/doc/development/gitlab_flavored_markdown/specification_guide/index.md @aqualls
 /doc/development/graphql_guide/ @kpaizee
-/doc/development/graphql_guide/batchloader.md @sselhorn
-/doc/development/hash_indexes.md @sselhorn
+/doc/development/graphql_guide/batchloader.md @aqualls
+/doc/development/hash_indexes.md @aqualls
 /doc/development/i18n/ @eread
 /doc/development/image_scaling.md @sselhorn
 /doc/development/import_export.md @eread
 /doc/development/index.md @sselhorn
-/doc/development/insert_into_tables_in_batches.md @sselhorn
+/doc/development/insert_into_tables_in_batches.md @aqualls
 /doc/development/integrations/ @kpaizee
 /doc/development/integrations/codesandbox.md @sselhorn
 /doc/development/integrations/secure_partner_integration.md @rdickenson
@@ -558,7 +559,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/development/internal_users.md @sselhorn
 /doc/development/issuable-like-models.md @msedlakjakubowski
 /doc/development/issue_types.md @msedlakjakubowski
-/doc/development/iterating_tables_in_batches.md @sselhorn
+/doc/development/iterating_tables_in_batches.md @aqualls
 /doc/development/kubernetes.md @sselhorn
 /doc/development/lfs.md @aqualls
 /doc/development/licensed_feature_availability.md @sselhorn
@@ -567,30 +568,30 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/development/new_fe_guide/modules/widget_extensions.md @aqualls
 /doc/development/new_fe_guide/tips.md @sselhorn
 /doc/development/omnibus.md @axil
-/doc/development/ordering_table_columns.md @sselhorn
+/doc/development/ordering_table_columns.md @aqualls
 /doc/development/packages.md @claytoncornell
 /doc/development/permissions.md @eread
 /doc/development/policies.md @eread
 /doc/development/product_qualified_lead_guide/index.md @kpaizee
 /doc/development/project_templates.md @fneill
 /doc/development/prometheus_metrics.md @msedlakjakubowski
-/doc/development/query_performance.md @sselhorn
-/doc/development/query_recorder.md @sselhorn
+/doc/development/query_performance.md @aqualls
+/doc/development/query_recorder.md @aqualls
 /doc/development/real_time.md @msedlakjakubowski
 /doc/development/secure_coding_guidelines.md @sselhorn
-/doc/development/serializing_data.md @sselhorn
+/doc/development/serializing_data.md @aqualls
 /doc/development/service_ping/ @claytoncornell
-/doc/development/single_table_inheritance.md @sselhorn
+/doc/development/single_table_inheritance.md @aqualls
 /doc/development/snowplow/ @claytoncornell
 /doc/development/spam_protection_and_captcha/ @eread
-/doc/development/sql.md @sselhorn
-/doc/development/swapping_tables.md @sselhorn
+/doc/development/sql.md @aqualls
+/doc/development/swapping_tables.md @aqualls
 /doc/development/testing_guide/best_practices.md @sselhorn
 /doc/development/testing_guide/end_to_end/best_practices.md @sselhorn
-/doc/development/understanding_explain_plans.md @sselhorn
+/doc/development/understanding_explain_plans.md @aqualls
 /doc/development/value_stream_analytics.md @fneill
 /doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md @fneill
-/doc/development/verifying_database_capabilities.md @sselhorn
+/doc/development/verifying_database_capabilities.md @aqualls
 /doc/development/wikis.md @aqualls
 /doc/development/work_items_widgets.md @msedlakjakubowski
 /doc/development/work_items.md @msedlakjakubowski
@@ -612,7 +613,8 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/operations/ @msedlakjakubowski
 /doc/operations/feature_flags.md @rdickenson
 /doc/operations/product_analytics.md @claytoncornell
-/doc/policy/ @axil
+/doc/policy/alpha-beta-support.md @axil
+/doc/policy/maintenance.md @axil
 /doc/raketasks/ @axil
 /doc/raketasks/generate_sample_prometheus_data.md @msedlakjakubowski
 /doc/raketasks/migrate_snippets.md @aqualls
@@ -624,11 +626,12 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/topics/autodevops/ @sselhorn
 /doc/topics/git/ @aqualls
 /doc/topics/gitlab_flow.md @aqualls
-/doc/topics/offline/ @axil
+/doc/topics/offline/index.md @axil
+/doc/topics/offline/quick_start_guide.md @axil
 /doc/topics/plan_and_track.md @msedlakjakubowski
 /doc/update/ @axil
-/doc/update/mysql_to_postgresql.md @sselhorn
-/doc/update/upgrading_postgresql_using_slony.md @sselhorn
+/doc/update/mysql_to_postgresql.md @aqualls
+/doc/update/upgrading_postgresql_using_slony.md @aqualls
 /doc/user/admin_area/analytics/ @fneill
 /doc/user/admin_area/broadcast_messages.md @kpaizee
 /doc/user/admin_area/credentials_inventory.md @eread
@@ -637,10 +640,10 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/user/admin_area/geo_nodes.md @axil
 /doc/user/admin_area/labels.md @msedlakjakubowski
 /doc/user/admin_area/license_file.md @sselhorn
-/doc/user/admin_area/license.md @kpaizee
+/doc/user/admin_area/license.md @sselhorn
 /doc/user/admin_area/merge_requests_approvals.md @aqualls
 /doc/user/admin_area/moderate_users.md @eread
-/doc/user/admin_area/monitoring/background_migrations.md @sselhorn
+/doc/user/admin_area/monitoring/background_migrations.md @aqualls
 /doc/user/admin_area/monitoring/health_check.md @msedlakjakubowski
 /doc/user/admin_area/reporting/spamcheck.md @axil
 /doc/user/admin_area/review_abuse_reports.md @eread
@@ -660,19 +663,17 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/user/admin_area/settings/push_event_activities_limit.md @aqualls
 /doc/user/admin_area/settings/rate_limit_on_issues_creation.md @msedlakjakubowski
 /doc/user/admin_area/settings/rate_limit_on_notes_creation.md @msedlakjakubowski
-/doc/user/admin_area/settings/rate_limit_on_users_api.md @eread
 /doc/user/admin_area/settings/third_party_offers.md @fneill
+/doc/user/admin_area/settings/usage_statistics.md @claytoncornell
 /doc/user/admin_area/settings/visibility_and_access_controls.md @aqualls
 /doc/user/analytics/ @fneill
 /doc/user/analytics/ci_cd_analytics.md @rdickenson
 /doc/user/application_security/ @rdickenson
 /doc/user/application_security/cluster_image_scanning/index.md @claytoncornell
 /doc/user/application_security/container_scanning/index.md @claytoncornell
-/doc/user/application_security/coverage_fuzzing/index.md @rdickenson
 /doc/user/application_security/cve_id_request.md @claytoncornell
 /doc/user/application_security/policies/ @claytoncornell
 /doc/user/application_security/security_dashboard/index.md @claytoncornell
-/doc/user/application_security/threat_monitoring/index.md @claytoncornell
 /doc/user/application_security/vulnerabilities/index.md @claytoncornell
 /doc/user/application_security/vulnerabilities/severities.md @claytoncornell
 /doc/user/application_security/vulnerability_report/index.md @claytoncornell
@@ -717,6 +718,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/user/infrastructure/clusters/manage/management_project_applications/prometheus.md @msedlakjakubowski
 /doc/user/infrastructure/clusters/manage/management_project_applications/runner.md @sselhorn
 /doc/user/infrastructure/clusters/manage/management_project_applications/sentry.md @msedlakjakubowski
+/doc/user/infrastructure/clusters/manage/management_project_applications/vault.md @sselhorn
 /doc/user/infrastructure/iac/ @sselhorn
 /doc/user/infrastructure/index.md @sselhorn
 /doc/user/markdown.md @aqualls
@@ -759,12 +761,15 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/user/project/merge_requests/csv_export.md @eread
 /doc/user/project/merge_requests/fail_fast_testing.md @marcel.amirault
 /doc/user/project/merge_requests/load_performance_testing.md @marcel.amirault
-/doc/user/project/merge_requests/reviews/index.md @aqualls
 /doc/user/project/merge_requests/status_checks.md @eread
 /doc/user/project/merge_requests/test_coverage_visualization.md @marcel.amirault
 /doc/user/project/merge_requests/testing_and_reports_in_merge_requests.md @marcel.amirault
-/doc/user/project/milestones/ @msedlakjakubowski
+/doc/user/project/milestones/burndown_and_burnup_charts.md @msedlakjakubowski
+/doc/user/project/milestones/index.md @msedlakjakubowski
 /doc/user/project/pages/ @aqualls
+/doc/user/project/protected_branches.md @aqualls
+/doc/user/project/protected_tags.md @aqualls
+/doc/user/project/push_options.md @aqualls
 /doc/user/project/quick_actions.md @msedlakjakubowski
 /doc/user/project/releases/index.md @rdickenson
 /doc/user/project/releases/release_cli.md @rdickenson
@@ -784,6 +789,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/user/public_access.md @fneill
 /doc/user/reserved_names.md @fneill
 /doc/user/search/advanced_search.md @sselhorn
+/doc/user/search/global_search/advanced_search_syntax.md @sselhorn
 /doc/user/search/index.md @aqualls
 /doc/user/shortcuts.md @aqualls
 /doc/user/snippets.md @aqualls

.rubocop_todo.yml

@@ -200,11 +200,6 @@ Style/CaseLikeIf:
 Style/EmptyMethod:
   Enabled: false
 
-# Offense count: 118
-# Cop supports --auto-correct.
-Style/ExplicitBlockArgument:
-  Enabled: false
-
 # Offense count: 581
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -224,11 +219,6 @@ Style/HashAsLastArrayItem:
 Style/HashEachMethods:
   Enabled: false
 
-# Offense count: 34
-# Configuration parameters: AllowIfModifier.
-Style/IfInsideElse:
-  Enabled: false
-
 # Offense count: 64
 # Cop supports --auto-correct.
 Style/KeywordParametersOrder:
@@ -241,13 +231,6 @@ Style/KeywordParametersOrder:
 Style/Lambda:
   Enabled: false
 
-# Offense count: 35
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinBodyLength.
-# SupportedStyles: skip_modifier_ifs, always
-Style/Next:
-  Enabled: false
-
 # Offense count: 101
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle.

.rubocop_todo/style/explicit_block_argument.yml

+---
+# Cop supports --auto-correct.
+Style/ExplicitBlockArgument:
+  # Offense count: 143
+  # Temporarily disabled due to too many offenses
+  Enabled: false
+  Exclude:
+    - 'app/controllers/admin/background_migrations_controller.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'app/models/application_record.rb'
+    - 'app/models/broadcast_message.rb'
+    - 'app/models/ci/build.rb'
+    - 'app/models/ci/build_trace_chunks/redis.rb'
+    - 'app/models/ci/build_trace_chunks/redis_trace_chunks.rb'
+    - 'app/models/concerns/counter_attribute.rb'
+    - 'app/models/merge_request.rb'
+    - 'app/models/snippet_repository.rb'
+    - 'app/services/import_export_clean_up_service.rb'
+    - 'app/services/issuable/clone/attributes_rewriter.rb'
+    - 'app/services/packages/debian/generate_distribution_key_service.rb'
+    - 'app/workers/concerns/each_shard_worker.rb'
+    - 'db/migrate/20210629031900_associate_existing_dast_builds_with_variables.rb'
+    - 'ee/app/services/gitlab_subscriptions/fetch_subscription_plans_service.rb'
+    - 'ee/app/services/group_saml/identity/destroy_service.rb'
+    - 'ee/lib/ee/backup/repositories.rb'
+    - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
+    - 'ee/lib/gitlab/audit/events/preloader.rb'
+    - 'ee/lib/gitlab/ci/config/security_orchestration_policies/processor.rb'
+    - 'ee/lib/gitlab/ci/parsers/license_compliance/v1.rb'
+    - 'ee/lib/gitlab/geo.rb'
+    - 'ee/lib/gitlab/geo/event_gap_tracking.rb'
+    - 'ee/lib/gitlab/items_collection.rb'
+    - 'ee/spec/features/epic_boards/multiple_epic_boards_spec.rb'
+    - 'ee/spec/features/projects/security/user_views_security_configuration_spec.rb'
+    - 'ee/spec/support/helpers/ee/migrations_helpers.rb'
+    - 'lib/api/helpers/caching.rb'
+    - 'lib/api/internal/base.rb'
+    - 'lib/banzai/filter/references/reference_filter.rb'
+    - 'lib/banzai/request_store_reference_cache.rb'
+    - 'lib/gitlab/application_context.rb'
+    - 'lib/gitlab/authorized_keys.rb'
+    - 'lib/gitlab/cache.rb'
+    - 'lib/gitlab/ci/build/artifacts/metadata/entry.rb'
+    - 'lib/gitlab/ci/reports/test_suite.rb'
+    - 'lib/gitlab/ci/variables/collection.rb'
+    - 'lib/gitlab/cleanup/remote_uploads.rb'
+    - 'lib/gitlab/database/dynamic_model_helpers.rb'
+    - 'lib/gitlab/database/reindexing/reindex_concurrently.rb'
+    - 'lib/gitlab/git/changes.rb'
+    - 'lib/gitlab/gitaly_client/list_blobs_adapter.rb'
+    - 'lib/gitlab/gitaly_client/namespace_service.rb'
+    - 'lib/gitlab/gitaly_client/ref_service.rb'
+    - 'lib/gitlab/gitaly_client/storage_settings.rb'
+    - 'lib/gitlab/github_import/client.rb'
+    - 'lib/gitlab/graphql/tracers/application_context_tracer.rb'
+    - 'lib/gitlab/import_export/import_failure_service.rb'
+    - 'lib/gitlab/import_export/json/ndjson_writer.rb'
+    - 'lib/gitlab/import_export/json/streaming_serializer.rb'
+    - 'lib/gitlab/import_export/project/base_task.rb'
+    - 'lib/gitlab/import_export/project/export_task.rb'
+    - 'lib/gitlab/import_export/project/import_task.rb'
+    - 'lib/gitlab/metrics/dashboard/cache.rb'
+    - 'lib/gitlab/metrics/dashboard/stages/base_stage.rb'
+    - 'lib/gitlab/profiler.rb'
+    - 'lib/gitlab/redis/wrapper.rb'
+    - 'lib/gitlab/reference_counter.rb'
+    - 'lib/gitlab/seeder.rb'
+    - 'lib/gitlab/sidekiq_middleware/monitor.rb'
+    - 'lib/gitlab/sidekiq_middleware/query_analyzer.rb'
+    - 'lib/gitlab/sidekiq_middleware/request_store_middleware.rb'
+    - 'lib/gitlab/sidekiq_middleware/server_metrics.rb'
+    - 'lib/gitlab/utils/measuring.rb'
+    - 'lib/tasks/config_lint.rake'
+    - 'qa/qa/ee/page/insights/show.rb'
+    - 'qa/qa/ee/page/operations_dashboard.rb'
+    - 'qa/qa/ee/page/project/issue/show.rb'
+    - 'qa/qa/ee/page/project/show.rb'
+    - 'qa/qa/ee/page/project/wiki/show.rb'
+    - 'qa/qa/flow/login.rb'
+    - 'qa/qa/page/admin/menu.rb'
+    - 'qa/qa/page/base.rb'
+    - 'qa/qa/page/component/blob_content.rb'
+    - 'qa/qa/page/group/settings/group_deploy_tokens.rb'
+    - 'qa/qa/page/profile/menu.rb'
+    - 'qa/qa/page/project/settings/deploy_keys.rb'
+    - 'qa/qa/page/project/settings/deploy_tokens.rb'
+    - 'qa/qa/page/sub_menus/common.rb'
+    - 'qa/qa/resource/events/base.rb'
+    - 'qa/qa/runtime/api/repository_storage_moves.rb'
+    - 'qa/qa/runtime/search.rb'
+    - 'qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb'
+    - 'rubocop/code_reuse_helpers.rb'
+    - 'spec/features/merge_request/user_sees_wip_help_message_spec.rb'
+    - 'spec/features/projects/features_visibility_spec.rb'
+    - 'spec/lib/banzai/filter/repository_link_filter_spec.rb'
+    - 'spec/lib/gitlab/ci/config/external/file/project_spec.rb'
+    - 'spec/lib/gitlab/database/query_analyzers/restrict_allowed_schemas_spec.rb'
+    - 'spec/lib/gitlab/pagination/offset_pagination_spec.rb'
+    - 'spec/lib/gitlab/usage_data_spec.rb'
+    - 'spec/models/repository_spec.rb'
+    - 'spec/services/pages/zip_directory_service_spec.rb'
+    - 'spec/services/todo_service_spec.rb'
+    - 'spec/support/helpers/feature_flag_helpers.rb'
+    - 'spec/support/helpers/features/runner_helpers.rb'
+    - 'spec/support/helpers/features/top_nav_spec_helpers.rb'
+    - 'spec/support/helpers/graphql_helpers.rb'
+    - 'spec/support/helpers/modal_helpers.rb'
+    - 'spec/support/helpers/next_found_instance_of.rb'
+    - 'spec/support/helpers/usage_data_helpers.rb'
+    - 'spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb'
+    - 'spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb'
+    - 'spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb'
+    - 'spec/uploaders/object_storage_spec.rb'
+    - 'tooling/lib/tooling/helm3_client.rb'

.rubocop_todo/style/if_inside_else.yml

+---
+Style/IfInsideElse:
+  # Offense count: 43
+  # Temporarily disabled due to too many offenses
+  Enabled: false
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/passwords_controller.rb'
+    - 'app/finders/projects_finder.rb'
+    - 'app/finders/user_recent_events_finder.rb'
+    - 'app/helpers/diff_helper.rb'
+    - 'app/helpers/members_helper.rb'
+    - 'app/helpers/search_helper.rb'
+    - 'app/models/ci/build.rb'
+    - 'app/models/namespace.rb'
+    - 'app/presenters/project_presenter.rb'
+    - 'app/services/service_ping/build_payload_service.rb'
+    - 'app/services/system_notes/commit_service.rb'
+    - 'app/services/task_list_toggle_service.rb'
+    - 'app/services/user_project_access_changed_service.rb'
+    - 'app/uploaders/gitlab_uploader.rb'
+    - 'config/settings.rb'
+    - 'ee/app/controllers/ee/registrations/welcome_controller.rb'
+    - 'ee/app/controllers/groups/omniauth_callbacks_controller.rb'
+    - 'ee/app/models/ee/namespace.rb'
+    - 'ee/app/models/protected_environments/authorizable.rb'
+    - 'ee/app/policies/ee/group_policy.rb'
+    - 'ee/app/services/app_sec/dast/site_profiles/audit/update_service.rb'
+    - 'ee/app/services/deployments/approval_service.rb'
+    - 'ee/app/services/geo/framework_repository_sync_service.rb'
+    - 'ee/app/services/geo/repository_base_sync_service.rb'
+    - 'ee/app/services/gitlab_subscriptions/fetch_subscription_plans_service.rb'
+    - 'ee/app/services/vulnerability_external_issue_links/create_service.rb'
+    - 'ee/lib/gitlab/geo/base_batcher.rb'
+    - 'lib/api/projects.rb'
+    - 'lib/gitlab/auth.rb'
+    - 'lib/gitlab/conflict/file.rb'
+    - 'lib/gitlab/sql/pattern.rb'
+    - 'lib/gitlab/usage/service_ping/payload_keys_processor.rb'
+    - 'lib/tasks/gitlab/cleanup.rake'
+    - 'lib/tasks/gitlab/shell.rake'
+    - 'qa/qa/resource/protected_branch.rb'
+    - 'qa/qa/specs/helpers/feature_flag.rb'
+    - 'rubocop/cop/migration/add_limit_to_text_columns.rb'
+    - 'scripts/review_apps/automated_cleanup.rb'
+    - 'spec/controllers/projects/merge_requests/conflicts_controller_spec.rb'
+    - 'spec/support/import_export/export_file_helper.rb'
+    - 'spec/support/shared_examples/finders/snippet_visibility_shared_examples.rb'
+    - 'spec/support/shared_examples/metrics/active_record_subscriber_shared_examples.rb'

.rubocop_todo/style/next.yml

+---
+# Cop supports --auto-correct.
+Style/Next:
+  # Offense count: 41
+  # Temporarily disabled due to too many offenses
+  Enabled: false
+  Exclude:
+    - 'app/finders/projects/serverless/functions_finder.rb'
+    - 'app/models/preloaders/environments/deployment_preloader.rb'
+    - 'app/models/route.rb'
+    - 'app/services/authorized_project_update/find_records_due_for_refresh_service.rb'
+    - 'app/validators/nested_attributes_duplicates_validator.rb'
+    - 'config/initializers/01_secret_token.rb'
+    - 'config/initializers/sidekiq_cluster.rb'
+    - 'ee/app/controllers/groups/analytics/cycle_analytics/value_streams_controller.rb'
+    - 'ee/app/services/app_sec/dast/profiles/create_associations_service.rb'
+    - 'ee/app/services/elastic/cluster_reindexing_service.rb'
+    - 'ee/app/services/gitlab_subscriptions/fetch_purchase_eligible_namespaces_service.rb'
+    - 'ee/app/services/security/auto_fix_service.rb'
+    - 'ee/db/fixtures/development/20_vulnerabilities.rb'
+    - 'ee/lib/ee/audit/protected_branches_changes_auditor.rb'
+    - 'ee/lib/gitlab/elastic/search_results.rb'
+    - 'ee/lib/system_check/geo/authorized_keys_check.rb'
+    - 'lib/backup/manager.rb'
+    - 'lib/banzai/filter/external_link_filter.rb'
+    - 'lib/banzai/filter/footnote_filter.rb'
+    - 'lib/banzai/filter/kroki_filter.rb'
+    - 'lib/banzai/filter/math_filter.rb'
+    - 'lib/banzai/filter/plantuml_filter.rb'
+    - 'lib/banzai/filter/table_of_contents_filter.rb'
+    - 'lib/gitlab/background_migration/encrypt_static_object_token.rb'
+    - 'lib/gitlab/database.rb'
+    - 'lib/gitlab/fogbugz_import/importer.rb'
+    - 'lib/gitlab/gitaly_client/repository_service.rb'
+    - 'lib/gitlab/import_export/attributes_permitter.rb'
+    - 'lib/gitlab/import_export/base/relation_object_saver.rb'
+    - 'lib/gitlab/metrics/samplers/base_sampler.rb'
+    - 'lib/gitlab/pagination/keyset/in_operator_optimization/strategies/record_loader_strategy.rb'
+    - 'lib/gitlab/reference_extractor.rb'
+    - 'lib/gitlab/tree_summary.rb'
+    - 'lib/tasks/gitlab/assets.rake'
+    - 'lib/tasks/gitlab/db/validate_config.rake'
+    - 'rubocop/cop/static_translation_definition.rb'
+    - 'scripts/perf/query_limiting_report.rb'
+    - 'spec/lib/gitlab/import_export/import_test_coverage_spec.rb'
+    - 'spec/presenters/packages/npm/package_presenter_spec.rb'

app/assets/javascripts/access_tokens/components/projects_token_selector.vue

@@ -148,7 +148,7 @@ export default {
       </template>
       <template #dropdown-footer>
         <gl-intersection-observer v-if="projects.pageInfo.hasNextPage" @appear="loadMoreProjects">
-          <gl-loading-icon v-if="isLoadingMoreProjects" size="md" />
+          <gl-loading-icon v-if="isLoadingMoreProjects" class="gl-mb-3" size="sm" />
         </gl-intersection-observer>
       </template>
     </gl-token-selector>

app/assets/javascripts/admin/statistics_panel/components/app.vue

@@ -29,7 +29,7 @@ export default {
   <div class="gl-card">
     <div class="gl-card-body">
       <h4>{{ __('Statistics') }}</h4>
-      <gl-loading-icon v-if="isLoading" size="md" class="my-3" />
+      <gl-loading-icon v-if="isLoading" size="lg" class="my-3" />
       <template v-else>
         <p
           v-for="statistic in getStatistics(statisticsLabels)"

app/assets/javascripts/blob/components/blob_content.vue

@@ -66,7 +66,7 @@ export default {
 </script>
 <template>
   <div class="blob-viewer" :data-type="activeViewer.type" :data-loaded="!loading">
-    <gl-loading-icon v-if="loading" size="md" color="dark" class="my-4 mx-auto" />
+    <gl-loading-icon v-if="loading" size="lg" color="dark" class="my-4 mx-auto" />
 
     <template v-else>
       <blob-content-error

app/assets/javascripts/boards/components/board_card_inner.vue

@@ -253,7 +253,7 @@ export default {
       <div
         class="gl-display-flex align-items-start flex-wrap-reverse board-card-number-container gl-overflow-hidden"
       >
-        <gl-loading-icon v-if="item.isLoading" size="md" class="mt-3" />
+        <gl-loading-icon v-if="item.isLoading" size="lg" class="mt-3" />
         <span
           v-if="item.referencePath"
           class="board-card-number gl-overflow-hidden gl-display-flex gl-mr-3 gl-mt-3"

app/assets/javascripts/boards/components/project_select.vue

@@ -140,7 +140,7 @@ export default {
         <span class="gl-text-gray-500">{{ $options.i18n.emptySearchResult }}</span>
       </gl-dropdown-text>
       <gl-intersection-observer v-if="hasNextPage" @appear="loadMoreProjects">
-        <gl-loading-icon v-if="groupProjectsFlags.isLoadingMore" size="md" />
+        <gl-loading-icon v-if="groupProjectsFlags.isLoadingMore" size="lg" />
       </gl-intersection-observer>
     </gl-dropdown>
   </div>

app/assets/javascripts/clusters/agents/components/activity_events_list.vue

@@ -124,7 +124,7 @@ export default {
 
 <template>
   <div>
-    <gl-loading-icon v-if="isLoading" size="md" />
+    <gl-loading-icon v-if="isLoading" size="lg" />
 
     <div v-else-if="hasEvents">
       <div

app/assets/javascripts/clusters/agents/components/show.vue

@@ -140,7 +140,7 @@ export default {
             </span>
           </template>
 
-          <gl-loading-icon v-if="isLoading" size="md" class="gl-m-3" />
+          <gl-loading-icon v-if="isLoading" size="lg" class="gl-m-3" />
 
           <div v-else>
             <token-table :tokens="tokens" :cluster-agent-id="clusterAgent.id" :cursor="cursor" />

app/assets/javascripts/clusters_list/components/agents.vue

@@ -175,7 +175,7 @@ export default {
 </script>
 
 <template>
-  <gl-loading-icon v-if="isLoading" size="md" />
+  <gl-loading-icon v-if="isLoading" size="lg" />
 
   <section v-else-if="agentList">
     <div v-if="agentList.length">

app/assets/javascripts/clusters_list/components/clusters.vue

@@ -224,7 +224,7 @@ export default {
 </script>
 
 <template>
-  <gl-loading-icon v-if="loadingClusters" size="md" />
+  <gl-loading-icon v-if="loadingClusters" size="lg" />
 
   <section v-else>
     <ancestor-notice />

app/assets/javascripts/clusters_list/components/clusters_view_all.vue

@@ -89,7 +89,7 @@ export default {
 </script>
 <template>
   <div>
-    <gl-loading-icon v-if="isLoading" size="md" />
+    <gl-loading-icon v-if="isLoading" size="lg" />
     <div v-show="!isLoading" data-testid="clusters-cards-container">
       <gl-card
         header-class="gl-bg-white gl-display-flex gl-align-items-center gl-justify-content-space-between gl-py-4"

app/assets/javascripts/content_editor/components/loading_indicator.vue

@@ -34,7 +34,7 @@ export default {
       class="gl-w-full gl-display-flex gl-justify-content-center gl-align-items-center gl-absolute gl-top-0 gl-bottom-0"
     >
       <div class="gl-bg-white gl-absolute gl-w-full gl-h-full gl-opacity-3"></div>
-      <gl-loading-icon size="md" />
+      <gl-loading-icon size="lg" />
     </div>
   </editor-state-observer>
 </template>

app/assets/javascripts/issues/list/components/issues_list_app.vue

@@ -13,6 +13,8 @@ import fuzzaldrinPlus from 'fuzzaldrin-plus';
 import IssueCardTimeInfo from 'ee_else_ce/issues/list/components/issue_card_time_info.vue';
 import getIssuesQuery from 'ee_else_ce/issues/list/queries/get_issues.query.graphql';
 import getIssuesCountsQuery from 'ee_else_ce/issues/list/queries/get_issues_counts.query.graphql';
+import getIssuesWithoutCrmQuery from 'ee_else_ce/issues/list/queries/get_issues_without_crm.query.graphql';
+import getIssuesCountsWithoutCrmQuery from 'ee_else_ce/issues/list/queries/get_issues_counts_without_crm.query.graphql';
 import createFlash, { FLASH_TYPES } from '~/flash';
 import { TYPE_USER } from '~/graphql_shared/constants';
 import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils';
@@ -154,7 +156,9 @@ export default {
   },
   apollo: {
     issues: {
-      query: getIssuesQuery,
+      query() {
+        return this.hasCrmParameter ? getIssuesQuery : getIssuesWithoutCrmQuery;
+      },
       variables() {
         return this.queryVariables;
       },
@@ -178,7 +182,9 @@ export default {
       debounce: 200,
     },
     issuesCounts: {
-      query: getIssuesCountsQuery,
+      query() {
+        return this.hasCrmParameter ? getIssuesCountsQuery : getIssuesCountsWithoutCrmQuery;
+      },
       variables() {
         return this.queryVariables;
       },
@@ -390,6 +396,12 @@ export default {
         ...this.urlFilterParams,
       };
     },
+    hasCrmParameter() {
+      return (
+        window.location.search.includes('crm_contact_id=') ||
+        window.location.search.includes('crm_organization_id=')
+      );
+    },
   },
   watch: {
     $route(newValue, oldValue) {

app/assets/javascripts/issues/list/constants.js

@@ -132,6 +132,8 @@ export const TOKEN_TYPE_CONFIDENTIAL = 'confidential';
 export const TOKEN_TYPE_ITERATION = 'iteration';
 export const TOKEN_TYPE_EPIC = 'epic_id';
 export const TOKEN_TYPE_WEIGHT = 'weight';
+export const TOKEN_TYPE_CONTACT = 'crm_contact';
+export const TOKEN_TYPE_ORGANIZATION = 'crm_organization';
 
 export const filters = {
   [TOKEN_TYPE_AUTHOR]: {
@@ -294,4 +296,24 @@ export const filters = {
       },
     },
   },
+  [TOKEN_TYPE_CONTACT]: {
+    [API_PARAM]: {
+      [NORMAL_FILTER]: 'crmContactId',
+    },
+    [URL_PARAM]: {
+      [OPERATOR_IS]: {
+        [NORMAL_FILTER]: 'crm_contact_id',
+      },
+    },
+  },
+  [TOKEN_TYPE_ORGANIZATION]: {
+    [API_PARAM]: {
+      [NORMAL_FILTER]: 'crmOrganizationId',
+    },
+    [URL_PARAM]: {
+      [OPERATOR_IS]: {
+        [NORMAL_FILTER]: 'crm_organization_id',
+      },
+    },
+  },
 };

app/assets/javascripts/issues/list/queries/get_issues.query.graphql

@@ -20,6 +20,8 @@ query getIssues(
   $releaseTag: [String!]
   $releaseTagWildcardId: ReleaseTagWildcardId
   $types: [IssueType!]
+  $crmContactId: String
+  $crmOrganizationId: String
   $not: NegatedIssueFilterInput
   $beforeCursor: String
   $afterCursor: String
@@ -43,6 +45,8 @@ query getIssues(
       milestoneWildcardId: $milestoneWildcardId
       myReactionEmoji: $myReactionEmoji
       types: $types
+      crmContactId: $crmContactId
+      crmOrganizationId: $crmOrganizationId
       not: $not
       before: $beforeCursor
       after: $afterCursor
@@ -76,6 +80,8 @@ query getIssues(
       releaseTag: $releaseTag
       releaseTagWildcardId: $releaseTagWildcardId
       types: $types
+      crmContactId: $crmContactId
+      crmOrganizationId: $crmOrganizationId
       not: $not
       before: $beforeCursor
       after: $afterCursor