From d5ff0674315196e88f48dc0838486b44cd005628 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Nov 2023 18:10:53 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/layout/argument_alignment.yml | 1 - .rubocop_todo/lint/unused_block_argument.yml | 1 - .../rspec/before_all_role_assignment.yml | 1 + .rubocop_todo/rspec/feature_category.yml | 1 - .rubocop_todo/style/if_unless_modifier.yml | 1 - .../style/inline_disable_annotation.yml | 1 - GITLAB_SHELL_VERSION | 2 +- .../diffs/components/diff_file.vue | 1 + .../issues/show/components/app.vue | 7 + .../super_sidebar/components/counter.vue | 2 +- .../super_sidebar/components/help_center.vue | 6 +- .../super_sidebar/components/nav_item.vue | 2 +- .../vue_shared/components/markdown/field.vue | 2 +- .../vue_shared/components/markdown/header.vue | 5 +- .../stylesheets/framework/brand_logo.scss | 13 - app/assets/stylesheets/framework/diffs.scss | 6 + .../stylesheets/framework/super_sidebar.scss | 104 +++++-- .../page_bundles/merge_requests.scss | 8 + app/assets/stylesheets/pages/issues.scss | 22 ++ app/assets/stylesheets/pages/notes.scss | 9 - .../stylesheets/themes/theme_helper.scss | 65 ++--- app/models/audit_event.rb | 4 + app/models/ci/build.rb | 4 + app/models/ci/sources/pipeline.rb | 5 - app/models/concerns/ci/partitionable.rb | 36 --- .../concerns/ci/partitionable/testing.rb | 47 +++ app/models/group.rb | 4 + app/models/packages/build_info.rb | 4 + app/models/pages/lookup_path.rb | 40 ++- app/models/pages/virtual_domain.rb | 27 +- app/models/user.rb | 10 + .../detailed_merge_status_service.rb | 2 +- app/workers/all_queues.yml | 9 + .../transform_references_worker.rb | 147 ++++++++++ .../bulk_import_async_references_pipeline.yml | 8 + ...s_from_multi_project_pipeline_triggers.yml | 2 +- config/sidekiq_queues.yml | 2 + ..._partition_id_to_ci_job_artifact_states.rb | 11 + db/schema_migrations/20231114131031 | 1 + db/structure.sql | 1 + .../blueprints/gitlab_steps/implementation.md | 99 +++---- doc/ci/pipelines/merged_results_pipelines.md | 2 - doc/development/database/keyset_pagination.md | 49 ++++ doc/development/documentation/versions.md | 10 + .../pipelines/legacy_references_pipeline.rb | 131 +++++++++ .../projects/pipelines/references_pipeline.rb | 126 ++------ lib/bulk_imports/projects/stage.rb | 10 +- lib/gitlab/pagination/cursor_based_keyset.rb | 18 +- lib/tasks/cleanup.rake | 35 --- locale/gitlab.pot | 9 - spec/db/schema_spec.rb | 5 +- spec/factories/ci/pipelines.rb | 4 + .../user_sees_merge_request_pipelines_spec.rb | 2 +- .../issues/show/components/app_spec.js | 27 ++ .../snippet_description_edit_spec.js.snap | 2 +- .../legacy_references_pipeline_spec.rb | 268 ++++++++++++++++++ .../pipelines/references_pipeline_spec.rb | 263 +++-------------- spec/lib/bulk_imports/projects/stage_spec.rb | 23 +- .../pagination/cursor_based_keyset_spec.rb | 97 +++---- spec/models/pages/lookup_path_spec.rb | 130 +++++---- spec/models/pages/virtual_domain_spec.rb | 92 +++--- .../detailed_merge_status_service_spec.rb | 6 + .../ci/partitioning_testing/cascade_check.rb | 2 +- .../ci/partitioning_testing/schema_helpers.rb | 2 +- spec/support/rspec_order.rb | 25 +- .../transform_references_worker_spec.rb | 257 +++++++++++++++++ spec/workers/every_sidekiq_worker_spec.rb | 1 + 67 files changed, 1532 insertions(+), 787 deletions(-) create mode 100644 app/models/concerns/ci/partitionable/testing.rb create mode 100644 app/workers/bulk_imports/transform_references_worker.rb create mode 100644 config/feature_flags/development/bulk_import_async_references_pipeline.yml create mode 100644 db/migrate/20231114131031_add_partition_id_to_ci_job_artifact_states.rb create mode 100644 db/schema_migrations/20231114131031 create mode 100644 lib/bulk_imports/projects/pipelines/legacy_references_pipeline.rb delete mode 100644 lib/tasks/cleanup.rake create mode 100644 spec/lib/bulk_imports/projects/pipelines/legacy_references_pipeline_spec.rb create mode 100644 spec/workers/bulk_imports/transform_references_worker_spec.rb diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index eecfaa8eb64..d2922613a72 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -595,7 +595,6 @@ Layout/ArgumentAlignment: - 'ee/app/graphql/ee/types/ci/runner_countable_connection_type.rb' - 'ee/app/graphql/ee/types/deployment_type.rb' - 'ee/app/graphql/ee/types/environment_type.rb' - - 'ee/app/graphql/ee/types/group_type.rb' - 'ee/app/graphql/ee/types/issues/negated_issue_filter_input_type.rb' - 'ee/app/graphql/ee/types/namespace_type.rb' - 'ee/app/graphql/ee/types/permission_types/deployment.rb' diff --git a/.rubocop_todo/lint/unused_block_argument.yml b/.rubocop_todo/lint/unused_block_argument.yml index 70c836e28ac..ea9cd78bcd8 100644 --- a/.rubocop_todo/lint/unused_block_argument.yml +++ b/.rubocop_todo/lint/unused_block_argument.yml @@ -235,7 +235,6 @@ Lint/UnusedBlockArgument: - 'lib/google_api/cloud_platform/client.rb' - 'lib/peek/views/gitaly.rb' - 'lib/security/ci_configuration/sast_build_action.rb' - - 'lib/tasks/cleanup.rake' - 'lib/tasks/contracts/merge_requests.rake' - 'lib/tasks/contracts/pipeline_schedules.rake' - 'lib/tasks/contracts/pipelines.rake' diff --git a/.rubocop_todo/rspec/before_all_role_assignment.yml b/.rubocop_todo/rspec/before_all_role_assignment.yml index 5ab492b4a29..7f4eeeb3d00 100644 --- a/.rubocop_todo/rspec/before_all_role_assignment.yml +++ b/.rubocop_todo/rspec/before_all_role_assignment.yml @@ -1098,6 +1098,7 @@ RSpec/BeforeAllRoleAssignment: - 'spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/commit_notes_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/issues_pipeline_spec.rb' + - 'spec/lib/bulk_imports/projects/pipelines/legacy_references_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/merge_requests_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/pipeline_schedules_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/project_pipeline_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 9e78a8821e1..d4646f82db1 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -2688,7 +2688,6 @@ RSpec/FeatureCategory: - 'spec/lib/bulk_imports/projects/pipelines/service_desk_setting_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/snippets_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline_spec.rb' - - 'spec/lib/bulk_imports/projects/stage_spec.rb' - 'spec/lib/bulk_imports/retry_pipeline_error_spec.rb' - 'spec/lib/bulk_imports/users_mapper_spec.rb' - 'spec/lib/constraints/admin_constrainer_spec.rb' diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml index 3527c4afcb5..c4f06597625 100644 --- a/.rubocop_todo/style/if_unless_modifier.yml +++ b/.rubocop_todo/style/if_unless_modifier.yml @@ -905,7 +905,6 @@ Style/IfUnlessModifier: - 'lib/sidebars/projects/menus/settings_menu.rb' - 'lib/system_check/app/systemd_unit_files_or_init_script_up_to_date_check.rb' - 'lib/system_check/init_helpers.rb' - - 'lib/tasks/cleanup.rake' - 'lib/tasks/eslint.rake' - 'lib/tasks/gitlab/assets.rake' - 'lib/tasks/gitlab/cleanup.rake' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index 1072cf397cb..37c6c6b93b4 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -3257,7 +3257,6 @@ Style/InlineDisableAnnotation: - 'spec/support/helpers/stub_snowplow.rb' - 'spec/support/helpers/wait_for_requests.rb' - 'spec/support/matchers/event_store.rb' - - 'spec/support/rspec_order.rb' - 'spec/support/shared_contexts/controllers/ambiguous_ref_controller_shared_context.rb' - 'spec/support/shared_contexts/disable_user_tracking.rb' - 'spec/support/shared_contexts/policies/project_policy_table_shared_context.rb' diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index f269bd38a5b..a742d263162 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -14.30.0 +14.30.1 diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 8c1cab20ece..c9fd25171aa 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -419,6 +419,7 @@ export default {