From 1d49db554e2a6c9a7ee1c8e8dbe4064ab06e87f4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 7 Feb 2025 00:07:29 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../ci/job_details/components/log/line.vue | 2 +- .../components/log/line_header.vue | 2 +- .../downstream_pipeline_dropdown.vue | 40 +++++ .../downstream_pipelines.vue | 19 +-- ...get_downstream_pipeline_jobs.query.graphql | 38 +++++ .../components/pipeline_new_form.vue | 55 ++++--- .../create_pipeline.mutation.graphql | 26 +++- .../ci/pipeline_new/graphql/resolvers.js | 29 ---- .../javascripts/ci/pipeline_new/index.js | 3 +- .../ci/pipeline_new/utils/filter_variables.js | 15 +- .../javascripts/diffs/components/app.vue | 7 +- .../diffs/components/diffs_file_tree.vue | 2 +- .../diffs/components/tree_list.vue | 4 +- .../components/import_status.vue | 11 +- .../vue_shared/components/file_row.vue | 5 +- .../vue_shared/components/topic_badges.vue | 5 +- .../bootstrap_migration_components.scss | 2 +- .../bootstrap_migration_reset.scss | 2 +- .../bootstrap_migration_variables.scss | 2 +- app/assets/stylesheets/color_modes/_dark.scss | 2 - app/assets/stylesheets/errors.scss | 2 +- app/assets/stylesheets/framework/awards.scss | 15 +- .../stylesheets/framework/breadcrumbs.scss | 2 +- app/assets/stylesheets/framework/common.scss | 5 +- app/assets/stylesheets/framework/diffs.scss | 12 +- .../stylesheets/framework/markdown_area.scss | 4 +- .../framework/responsive_tables.scss | 5 +- .../secondary_navigation_elements.scss | 4 +- app/assets/stylesheets/framework/sidebar.scss | 10 +- app/assets/stylesheets/framework/tabs.scss | 6 +- .../stylesheets/framework/typography.scss | 9 +- .../stylesheets/framework/variables.scss | 2 - .../framework/variables_overrides.scss | 6 +- .../page_bundles/_ide_monaco_overrides.scss | 2 +- .../page_bundles/_ide_theme_overrides.scss | 24 +-- .../page_bundles/_pipeline_mixins.scss | 15 -- .../stylesheets/page_bundles/build.scss | 25 ++- app/assets/stylesheets/page_bundles/ide.scss | 42 ++--- .../stylesheets/page_bundles/incidents.scss | 2 +- .../stylesheets/page_bundles/milestone.scss | 2 +- .../page_bundles/profiles/preferences.scss | 4 +- app/assets/stylesheets/snippets.scss | 2 +- .../populate_and_use_build_source_table.yml | 4 +- .../17-7-deprecate-SPPgraphqlmutation.yml | 18 ++- ...ll_bulk_import_export_batches_group_id.yml | 8 + ..._bulk_import_export_batches_project_id.yml | 8 + ...ance_violation_null_target_project_ids.yml | 8 +- ...sections_protected_branch_namespace_id.yml | 8 + ...s_sections_protected_branch_project_id.yml | 8 + ..._storage_moves_snippet_organization_id.yml | 8 + ...itory_storage_moves_snippet_project_id.yml | 8 + db/docs/bulk_import_export_batches.yml | 3 + db/docs/required_code_owners_sections.yml | 3 + db/docs/snippet_repository_storage_moves.yml | 3 + ...roject_id_to_bulk_import_export_batches.rb | 9 ++ ..._group_id_to_bulk_import_export_batches.rb | 9 ++ ...ect_id_to_required_code_owners_sections.rb | 9 ++ ...ace_id_to_required_code_owners_sections.rb | 9 ++ ..._id_to_snippet_repository_storage_moves.rb | 9 ++ ..._id_to_snippet_repository_storage_moves.rb | 9 ++ ...iance_violation_null_target_project_ids.rb | 18 +-- ...ation_null_target_project_ids_migration.rb | 28 ++++ ...ulk_import_export_batches_on_project_id.rb | 16 ++ ...ulk_import_export_batches_project_id_fk.rb | 16 ++ ...mport_export_batches_project_id_trigger.rb | 25 +++ ...l_bulk_import_export_batches_project_id.rb | 40 +++++ ..._bulk_import_export_batches_on_group_id.rb | 16 ++ ..._bulk_import_export_batches_group_id_fk.rb | 16 ++ ..._import_export_batches_group_id_trigger.rb | 25 +++ ...ill_bulk_import_export_batches_group_id.rb | 40 +++++ ...sections_on_protected_branch_project_id.rb | 16 ++ ...sections_protected_branch_project_id_fk.rb | 17 +++ ...ons_protected_branch_project_id_trigger.rb | 25 +++ ...rs_sections_protected_branch_project_id.rb | 40 +++++ ...ctions_on_protected_branch_namespace_id.rb | 16 ++ ...ctions_protected_branch_namespace_id_fk.rb | 17 +++ ...s_protected_branch_namespace_id_trigger.rb | 25 +++ ..._sections_protected_branch_namespace_id.rb | 40 +++++ ...ory_storage_moves_on_snippet_project_id.rb | 16 ++ ...ory_storage_moves_snippet_project_id_fk.rb | 17 +++ ...torage_moves_snippet_project_id_trigger.rb | 25 +++ ...sitory_storage_moves_snippet_project_id.rb | 40 +++++ ...torage_moves_on_snippet_organization_id.rb | 16 ++ ...torage_moves_snippet_organization_id_fk.rb | 17 +++ ...e_moves_snippet_organization_id_trigger.rb | 25 +++ ...y_storage_moves_snippet_organization_id.rb | 40 +++++ db/schema_migrations/20250203155647 | 1 + db/schema_migrations/20250205194211 | 1 + db/schema_migrations/20250205194212 | 1 + db/schema_migrations/20250205194213 | 1 + db/schema_migrations/20250205194214 | 1 + db/schema_migrations/20250205194215 | 1 + db/schema_migrations/20250205194216 | 1 + db/schema_migrations/20250205194217 | 1 + db/schema_migrations/20250205194218 | 1 + db/schema_migrations/20250205194219 | 1 + db/schema_migrations/20250205194220 | 1 + db/schema_migrations/20250205200238 | 1 + db/schema_migrations/20250205200239 | 1 + db/schema_migrations/20250205200240 | 1 + db/schema_migrations/20250205200241 | 1 + db/schema_migrations/20250205200242 | 1 + db/schema_migrations/20250205200243 | 1 + db/schema_migrations/20250205200244 | 1 + db/schema_migrations/20250205200245 | 1 + db/schema_migrations/20250205200246 | 1 + db/schema_migrations/20250205200247 | 1 + db/schema_migrations/20250205200739 | 1 + db/schema_migrations/20250205200740 | 1 + db/schema_migrations/20250205200741 | 1 + db/schema_migrations/20250205200742 | 1 + db/schema_migrations/20250205200743 | 1 + db/schema_migrations/20250205200744 | 1 + db/schema_migrations/20250205200745 | 1 + db/schema_migrations/20250205200746 | 1 + db/schema_migrations/20250205200747 | 1 + db/schema_migrations/20250205200748 | 1 + db/structure.sql | 144 ++++++++++++++++++ doc/administration/appearance.md | 27 ++++ .../configure_instance/users_notifications.md | 2 +- doc/integration/saml.md | 5 +- doc/update/breaking_windows.md | 2 +- doc/update/deprecations.md | 10 +- doc/user/group/saml_sso/index.md | 4 +- .../lets_encrypt_integration.md | 2 +- ...ill_bulk_import_export_batches_group_id.rb | 10 ++ ...l_bulk_import_export_batches_project_id.rb | 10 ++ ..._sections_protected_branch_namespace_id.rb | 10 ++ ...rs_sections_protected_branch_project_id.rb | 10 ++ ...y_storage_moves_snippet_organization_id.rb | 10 ++ ...sitory_storage_moves_snippet_project_id.rb | 10 ++ locale/gitlab.pot | 6 + qa/gdk/Dockerfile.gdk | 2 +- .../components/log/line_header_spec.js | 8 +- .../job_details/components/log/line_spec.js | 8 +- .../downstream_pipeline_dropdown_spec.js | 47 ++++++ .../downstream_pipelines_spec.js | 33 ++-- ...ication_required_pipeline_new_form_spec.js | 17 ++- .../components/pipeline_new_form_spec.js | 82 +++++----- spec/frontend/ci/pipeline_new/mock_data.js | 11 +- .../utils/filter_variables_spec.js | 12 +- spec/frontend/diffs/components/app_spec.js | 86 ++++++----- .../diffs/components/diffs_file_tree_spec.js | 7 + .../diffs/components/tree_list_spec.js | 6 + spec/frontend/fixtures/pipeline_create.rb | 91 +++++++++++ spec/frontend/fixtures/pipelines.rb | 99 ++++++------ .../vue_shared/components/file_row_spec.js | 18 ++- .../components/topic_badges_spec.js | 13 ++ ...ulk_import_export_batches_group_id_spec.rb | 15 ++ ...k_import_export_batches_project_id_spec.rb | 15 ++ ...ions_protected_branch_namespace_id_spec.rb | 15 ++ ...ctions_protected_branch_project_id_spec.rb | 15 ++ ...rage_moves_snippet_organization_id_spec.rb | 15 ++ ...y_storage_moves_snippet_project_id_spec.rb | 15 ++ ...null_target_project_ids_migration_spec.rb} | 2 +- ...k_import_export_batches_project_id_spec.rb | 33 ++++ ...ulk_import_export_batches_group_id_spec.rb | 33 ++++ ...ctions_protected_branch_project_id_spec.rb | 33 ++++ ...ions_protected_branch_namespace_id_spec.rb | 33 ++++ ...y_storage_moves_snippet_project_id_spec.rb | 33 ++++ ...rage_moves_snippet_organization_id_spec.rb | 33 ++++ 162 files changed, 1960 insertions(+), 409 deletions(-) create mode 100644 app/assets/javascripts/ci/pipeline_mini_graph/downstream_pipeline_dropdown.vue create mode 100644 app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_downstream_pipeline_jobs.query.graphql delete mode 100644 app/assets/javascripts/ci/pipeline_new/graphql/resolvers.js rename config/feature_flags/{wip => beta}/populate_and_use_build_source_table.yml (76%) create mode 100644 db/docs/batched_background_migrations/backfill_bulk_import_export_batches_group_id.yml create mode 100644 db/docs/batched_background_migrations/backfill_bulk_import_export_batches_project_id.yml create mode 100644 db/docs/batched_background_migrations/backfill_required_code_owners_sections_protected_branch_namespace_id.yml create mode 100644 db/docs/batched_background_migrations/backfill_required_code_owners_sections_protected_branch_project_id.yml create mode 100644 db/docs/batched_background_migrations/backfill_snippet_repository_storage_moves_snippet_organization_id.yml create mode 100644 db/docs/batched_background_migrations/backfill_snippet_repository_storage_moves_snippet_project_id.yml create mode 100644 db/migrate/20250205194211_add_project_id_to_bulk_import_export_batches.rb create mode 100644 db/migrate/20250205194216_add_group_id_to_bulk_import_export_batches.rb create mode 100644 db/migrate/20250205200238_add_protected_branch_project_id_to_required_code_owners_sections.rb create mode 100644 db/migrate/20250205200243_add_protected_branch_namespace_id_to_required_code_owners_sections.rb create mode 100644 db/migrate/20250205200739_add_snippet_project_id_to_snippet_repository_storage_moves.rb create mode 100644 db/migrate/20250205200744_add_snippet_organization_id_to_snippet_repository_storage_moves.rb create mode 100644 db/post_migrate/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration.rb create mode 100644 db/post_migrate/20250205194212_index_bulk_import_export_batches_on_project_id.rb create mode 100644 db/post_migrate/20250205194213_add_bulk_import_export_batches_project_id_fk.rb create mode 100644 db/post_migrate/20250205194214_add_bulk_import_export_batches_project_id_trigger.rb create mode 100644 db/post_migrate/20250205194215_queue_backfill_bulk_import_export_batches_project_id.rb create mode 100644 db/post_migrate/20250205194217_index_bulk_import_export_batches_on_group_id.rb create mode 100644 db/post_migrate/20250205194218_add_bulk_import_export_batches_group_id_fk.rb create mode 100644 db/post_migrate/20250205194219_add_bulk_import_export_batches_group_id_trigger.rb create mode 100644 db/post_migrate/20250205194220_queue_backfill_bulk_import_export_batches_group_id.rb create mode 100644 db/post_migrate/20250205200239_index_required_code_owners_sections_on_protected_branch_project_id.rb create mode 100644 db/post_migrate/20250205200240_add_required_code_owners_sections_protected_branch_project_id_fk.rb create mode 100644 db/post_migrate/20250205200241_add_required_code_owners_sections_protected_branch_project_id_trigger.rb create mode 100644 db/post_migrate/20250205200242_queue_backfill_required_code_owners_sections_protected_branch_project_id.rb create mode 100644 db/post_migrate/20250205200244_index_required_code_owners_sections_on_protected_branch_namespace_id.rb create mode 100644 db/post_migrate/20250205200245_add_required_code_owners_sections_protected_branch_namespace_id_fk.rb create mode 100644 db/post_migrate/20250205200246_add_required_code_owners_sections_protected_branch_namespace_id_trigger.rb create mode 100644 db/post_migrate/20250205200247_queue_backfill_required_code_owners_sections_protected_branch_namespace_id.rb create mode 100644 db/post_migrate/20250205200740_index_snippet_repository_storage_moves_on_snippet_project_id.rb create mode 100644 db/post_migrate/20250205200741_add_snippet_repository_storage_moves_snippet_project_id_fk.rb create mode 100644 db/post_migrate/20250205200742_add_snippet_repository_storage_moves_snippet_project_id_trigger.rb create mode 100644 db/post_migrate/20250205200743_queue_backfill_snippet_repository_storage_moves_snippet_project_id.rb create mode 100644 db/post_migrate/20250205200745_index_snippet_repository_storage_moves_on_snippet_organization_id.rb create mode 100644 db/post_migrate/20250205200746_add_snippet_repository_storage_moves_snippet_organization_id_fk.rb create mode 100644 db/post_migrate/20250205200747_add_snippet_repository_storage_moves_snippet_organization_id_trigger.rb create mode 100644 db/post_migrate/20250205200748_queue_backfill_snippet_repository_storage_moves_snippet_organization_id.rb create mode 100644 db/schema_migrations/20250203155647 create mode 100644 db/schema_migrations/20250205194211 create mode 100644 db/schema_migrations/20250205194212 create mode 100644 db/schema_migrations/20250205194213 create mode 100644 db/schema_migrations/20250205194214 create mode 100644 db/schema_migrations/20250205194215 create mode 100644 db/schema_migrations/20250205194216 create mode 100644 db/schema_migrations/20250205194217 create mode 100644 db/schema_migrations/20250205194218 create mode 100644 db/schema_migrations/20250205194219 create mode 100644 db/schema_migrations/20250205194220 create mode 100644 db/schema_migrations/20250205200238 create mode 100644 db/schema_migrations/20250205200239 create mode 100644 db/schema_migrations/20250205200240 create mode 100644 db/schema_migrations/20250205200241 create mode 100644 db/schema_migrations/20250205200242 create mode 100644 db/schema_migrations/20250205200243 create mode 100644 db/schema_migrations/20250205200244 create mode 100644 db/schema_migrations/20250205200245 create mode 100644 db/schema_migrations/20250205200246 create mode 100644 db/schema_migrations/20250205200247 create mode 100644 db/schema_migrations/20250205200739 create mode 100644 db/schema_migrations/20250205200740 create mode 100644 db/schema_migrations/20250205200741 create mode 100644 db/schema_migrations/20250205200742 create mode 100644 db/schema_migrations/20250205200743 create mode 100644 db/schema_migrations/20250205200744 create mode 100644 db/schema_migrations/20250205200745 create mode 100644 db/schema_migrations/20250205200746 create mode 100644 db/schema_migrations/20250205200747 create mode 100644 db/schema_migrations/20250205200748 create mode 100644 lib/gitlab/background_migration/backfill_bulk_import_export_batches_group_id.rb create mode 100644 lib/gitlab/background_migration/backfill_bulk_import_export_batches_project_id.rb create mode 100644 lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_namespace_id.rb create mode 100644 lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_project_id.rb create mode 100644 lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_organization_id.rb create mode 100644 lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_project_id.rb create mode 100644 spec/frontend/ci/pipeline_mini_graph/downstream_pipeline_dropdown_spec.js create mode 100644 spec/frontend/fixtures/pipeline_create.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_bulk_import_export_batches_group_id_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_bulk_import_export_batches_project_id_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_namespace_id_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_project_id_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_organization_id_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_project_id_spec.rb rename spec/migrations/{20241114202257_queue_backfill_compliance_violation_null_target_project_ids_spec.rb => 20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration_spec.rb} (86%) create mode 100644 spec/migrations/20250205194215_queue_backfill_bulk_import_export_batches_project_id_spec.rb create mode 100644 spec/migrations/20250205194220_queue_backfill_bulk_import_export_batches_group_id_spec.rb create mode 100644 spec/migrations/20250205200242_queue_backfill_required_code_owners_sections_protected_branch_project_id_spec.rb create mode 100644 spec/migrations/20250205200247_queue_backfill_required_code_owners_sections_protected_branch_namespace_id_spec.rb create mode 100644 spec/migrations/20250205200743_queue_backfill_snippet_repository_storage_moves_snippet_project_id_spec.rb create mode 100644 spec/migrations/20250205200748_queue_backfill_snippet_repository_storage_moves_snippet_organization_id_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index ff30ca95eda..479586adf40 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -575e8b7baeb800a8d0d0f28a80c0461a7a0db741 +12794f56ea8f6d289298e9befd2ee6fbd56f4dc4 diff --git a/app/assets/javascripts/ci/job_details/components/log/line.vue b/app/assets/javascripts/ci/job_details/components/log/line.vue index b04a6b7ec33..16781e745b3 100644 --- a/app/assets/javascripts/ci/job_details/components/log/line.vue +++ b/app/assets/javascripts/ci/job_details/components/log/line.vue @@ -69,7 +69,7 @@ export default { class: [ 'js-log-line', 'job-log-line', - { 'gl-bg-gray-700': isHighlighted || applyHashHighlight }, + { 'job-log-line-highlight': isHighlighted || applyHashHighlight }, ], }, [ diff --git a/app/assets/javascripts/ci/job_details/components/log/line_header.vue b/app/assets/javascripts/ci/job_details/components/log/line_header.vue index 948853bd898..2a3e3ad3459 100644 --- a/app/assets/javascripts/ci/job_details/components/log/line_header.vue +++ b/app/assets/javascripts/ci/job_details/components/log/line_header.vue @@ -70,7 +70,7 @@ export default {