Add latest changes from gitlab-org/gitlab@master

2 files changed, 163 insertions, 0 deletions

diff --git a/.rubocop_todo/style/explicit_block_argument.yml b/.rubocop_todo/style/explicit_block_argument.yml
new file mode 100644
index 00000000000..f6bff468c76
--- /dev/null
+++ b/.rubocop_todo/style/explicit_block_argument.yml
@@ -0,0 +1,114 @@
+---
+# 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'
diff --git a/.rubocop_todo/style/if_inside_else.yml b/.rubocop_todo/style/if_inside_else.yml
new file mode 100644
index 00000000000..fcddbae74fc
--- /dev/null
+++ b/.rubocop_todo/style/if_inside_else.yml
@@ -0,0 +1,49 @@
+---
+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'