From cd0b43eb255bf404e8f732e67ed3e3771d4d6ba4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 May 2024 21:19:13 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../layout/first_hash_element_indentation.yml | 13 --- .../lint/ambiguous_operator_precedence.yml | 13 --- .../components/notes/abuse_report_note.vue | 2 +- .../branches/components/divergence_graph.vue | 2 +- .../components/pipeline_new_form.vue | 10 ++ .../javascripts/ci/pipeline_new/constants.js | 3 + .../javascripts/ci/pipeline_new/index.js | 7 ++ .../diffs/components/commit_item.vue | 4 +- .../diffs/components/compare_versions.vue | 2 +- .../diffs/components/diff_content.vue | 2 +- .../diffs/components/diff_file_header.vue | 2 +- .../components/environment_item.vue | 6 +- .../groups/components/group_item.vue | 6 +- .../ide/components/ide_status_mr.vue | 2 +- .../components/merge_requests_list_app.vue | 2 +- .../notes/components/noteable_note.vue | 2 +- .../shared/wikis/components/wiki_form.vue | 28 +++--- .../shared/wikis/components/wiki_template.vue | 1 + .../components/detailed_metric.vue | 2 +- .../repository/components/table/header.vue | 4 +- .../repository/components/table/row.vue | 2 +- .../javascripts/snippet/collapsible_input.js | 8 +- .../components/snippet_description_edit.vue | 4 +- .../components/artifacts_list.vue | 2 +- .../paginated_table_with_search_and_tabs.vue | 2 +- .../components/notes/work_item_note.vue | 2 +- app/assets/stylesheets/page_bundles/wiki.scss | 6 +- app/helpers/ci/pipelines_helper.rb | 17 ++++ .../ci/daily_build_group_report_result.rb | 4 + .../concerns/ci/partitionable/testing.rb | 1 + .../ci/variables/_variable_header.html.haml | 2 +- app/views/explore/projects/topic.html.haml | 2 +- app/views/groups/_activities.html.haml | 2 +- app/views/kaminari/gitlab/_gap.html.haml | 2 +- app/views/kaminari/gitlab/_page.html.haml | 2 +- app/views/projects/_activity.html.haml | 6 +- app/views/projects/artifacts/file.html.haml | 2 +- app/views/projects/blob/_blob.html.haml | 2 +- app/views/projects/branches/_branch.html.haml | 2 +- .../projects/commit/_commit_box.html.haml | 2 +- app/views/projects/commits/_commit.html.haml | 4 +- app/views/projects/commits/show.html.haml | 6 +- app/views/projects/diffs/_file.html.haml | 4 +- app/views/projects/jobs/_user.html.haml | 2 +- .../mirrors/_mirror_repos_list.html.haml | 2 +- app/views/projects/pipelines/new.html.haml | 13 +-- .../shared/_tags_list.html.haml | 2 +- .../doorkeeper/applications/_index.html.haml | 8 +- .../_recent_deliveries_table.html.haml | 4 +- app/views/shared/snippets/_embed.html.haml | 2 +- app/views/shared/wikis/_sidebar.html.haml | 2 +- app/views/shared/wikis/diff.html.haml | 2 +- .../user_settings/gpg_keys/_key.html.haml | 2 +- .../gpg_keys/_key_table.html.haml | 2 +- .../ssh_keys/_key_table.html.haml | 2 +- ...20210915205112_packages_delete_package.yml | 6 +- .../events/click_expand_panel_on_settings.yml | 2 +- .../ops/show_gitlab_agent_feedback.yml | 2 +- ...click_expand_panel_on_settings_monthly.yml | 2 +- ..._click_expand_panel_on_settings_weekly.yml | 2 +- config/metrics/schema/product_groups.json | 2 +- ..._id_ci_daily_build_group_report_result.yml | 9 ++ ...d_to_ci_daily_build_group_report_result.rb | 9 ++ ...n_id_ci_daily_build_group_report_result.rb | 26 +++++ db/schema_migrations/20240516090020 | 1 + db/schema_migrations/20240516123512 | 1 + db/structure.sql | 3 +- doc/api/graphql/reference/index.md | 4 +- doc/user/gitlab_duo_examples.md | 4 +- ...n_id_ci_daily_build_group_report_result.rb | 18 ++++ .../ci/build/rules/rule/clause/exists.rb | 12 +-- locale/gitlab.pot | 3 + spec/db/schema_spec.rb | 1 + .../projects/pipelines/pipelines_spec.rb | 12 ++- .../divergence_graph_spec.js.snap | 4 +- ...ication_required_pipeline_new_form_spec.js | 98 +++++++++++++++++++ .../components/pipeline_new_form_spec.js | 4 + spec/frontend/ci/pipeline_new/mock_data.js | 6 ++ .../pages/projects/pages_domains/form_spec.js | 10 +- .../table/__snapshots__/row_spec.js.snap | 6 +- .../snippet/collapsible_input_spec.js | 8 +- .../snippet_description_edit_spec.js.snap | 2 +- .../snippet_description_edit_spec.js | 6 +- spec/helpers/ci/pipelines_helper_spec.rb | 25 ++++- ...ci_daily_build_group_report_result_spec.rb | 87 ++++++++++++++++ .../ci/build/rules/rule/clause/exists_spec.rb | 2 +- spec/mailers/notify_spec.rb | 2 +- ...ci_daily_build_group_report_result_spec.rb | 56 +++++++++++ spec/models/appearance_spec.rb | 12 +-- spec/models/ci/build_spec.rb | 14 +-- .../daily_build_group_report_result_spec.rb | 15 +++ spec/models/commit_spec.rb | 2 +- .../concerns/pg_full_text_searchable_spec.rb | 8 +- spec/models/custom_emoji_spec.rb | 2 +- spec/models/environment_spec.rb | 2 +- spec/models/grafana_integration_spec.rb | 2 +- .../chat_message/push_message_spec.rb | 2 +- spec/models/merge_request_diff_spec.rb | 2 +- spec/models/packages/package_file_spec.rb | 12 +-- spec/models/prometheus_alert_spec.rb | 2 +- .../container_repository_details_spec.rb | 32 ++++-- 101 files changed, 584 insertions(+), 200 deletions(-) create mode 100644 db/docs/batched_background_migrations/backfill_partition_id_ci_daily_build_group_report_result.yml create mode 100644 db/migrate/20240516090020_add_partition_id_to_ci_daily_build_group_report_result.rb create mode 100644 db/post_migrate/20240516123512_queue_backfill_partition_id_ci_daily_build_group_report_result.rb create mode 100644 db/schema_migrations/20240516090020 create mode 100644 db/schema_migrations/20240516123512 create mode 100644 lib/gitlab/background_migration/backfill_partition_id_ci_daily_build_group_report_result.rb create mode 100644 spec/frontend/ci/pipeline_new/components/identity_verification_required_pipeline_new_form_spec.js create mode 100644 spec/lib/gitlab/background_migration/backfill_partition_id_ci_daily_build_group_report_result_spec.rb create mode 100644 spec/migrations/20240516123512_queue_backfill_partition_id_ci_daily_build_group_report_result_spec.rb diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml index 0dd714fa8c7..02cb82c9f22 100644 --- a/.rubocop_todo/layout/first_hash_element_indentation.yml +++ b/.rubocop_todo/layout/first_hash_element_indentation.yml @@ -13,19 +13,6 @@ Layout/FirstHashElementIndentation: - 'ee/app/services/timebox_report_service.rb' - 'ee/lib/ee/gitlab/ci/parsers.rb' - 'ee/lib/ee/gitlab/usage_data.rb' - - 'ee/lib/elastic/latest/issue_class_proxy.rb' - - 'ee/lib/gitlab/analytics/type_of_work/tasks_by_type.rb' - - 'ee/lib/gitlab/ci/parsers/security/formatters/dependency_list.rb' - - 'ee/lib/gitlab/graphql/aggregations/epics/lazy_epic_aggregate.rb' - - 'ee/spec/controllers/admin/application_settings_controller_spec.rb' - - 'ee/spec/controllers/ee/projects/jobs_controller_spec.rb' - - 'ee/spec/controllers/ee/projects/variables_controller_spec.rb' - - 'ee/spec/controllers/groups/epic_boards_controller_spec.rb' - - 'ee/spec/controllers/groups/issues_controller_spec.rb' - - 'ee/spec/controllers/projects/integrations/jira/issues_controller_spec.rb' - - 'ee/spec/controllers/projects/repositories_controller_spec.rb' - - 'ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb' - - 'ee/spec/controllers/projects_controller_spec.rb' - 'ee/spec/factories/dependencies.rb' - 'ee/spec/finders/epics_finder_spec.rb' - 'ee/spec/finders/namespaces/free_user_cap/users_finder_spec.rb' diff --git a/.rubocop_todo/lint/ambiguous_operator_precedence.yml b/.rubocop_todo/lint/ambiguous_operator_precedence.yml index 46108eb2527..cd513753b67 100644 --- a/.rubocop_todo/lint/ambiguous_operator_precedence.yml +++ b/.rubocop_todo/lint/ambiguous_operator_precedence.yml @@ -49,16 +49,3 @@ Lint/AmbiguousOperatorPrecedence: - 'spec/lib/gitlab/regex_spec.rb' - 'spec/lib/gitlab/search/abuse_validators/no_abusive_term_length_validator_spec.rb' - 'spec/lib/gitlab/slash_commands/deploy_spec.rb' - - 'spec/mailers/notify_spec.rb' - - 'spec/models/appearance_spec.rb' - - 'spec/models/ci/build_spec.rb' - - 'spec/models/ci/runner_spec.rb' - - 'spec/models/commit_spec.rb' - - 'spec/models/concerns/pg_full_text_searchable_spec.rb' - - 'spec/models/custom_emoji_spec.rb' - - 'spec/models/environment_spec.rb' - - 'spec/models/grafana_integration_spec.rb' - - 'spec/models/integrations/chat_message/push_message_spec.rb' - - 'spec/models/merge_request_diff_spec.rb' - - 'spec/models/packages/package_file_spec.rb' - - 'spec/models/prometheus_alert_spec.rb' diff --git a/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_note.vue b/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_note.vue index 4423eb9e7b2..64dbaa6ea00 100644 --- a/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_note.vue +++ b/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_note.vue @@ -104,7 +104,7 @@ export default { :note-id="note.id" :note-url="note.url" > - · + ·