From 94bf8a50bbd1c51186fdc7f5c05ecd62f6aad9e1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 5 Sep 2024 21:07:30 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/test-on-omnibus/main.gitlab-ci.yml | 2 - .../layout/line_break_after_final_mixin.yml | 15 -- .../components/pipeline_schedules_form.vue | 20 +- .../components/wrappers/code_block.vue | 4 +- app/assets/javascripts/ide/components/ide.vue | 2 +- .../ide/components/ide_status_mr.vue | 4 +- .../oauth_domain_mismatch_error.vue | 2 +- .../terminal_sync/terminal_sync_status.vue | 12 +- .../approvals/approvals_summary_optional.vue | 2 +- app/assets/stylesheets/framework/common.scss | 10 - app/assets/stylesheets/framework/header.scss | 6 + .../stylesheets/highlight/_white_base.scss | 2 +- app/assets/stylesheets/utilities.scss | 6 - app/models/concerns/enums/sbom.rb | 9 + app/models/operations/feature_flag.rb | 4 + app/policies/personal_access_token_policy.rb | 2 + app/services/merge_requests/base_service.rb | 1 + .../profiles/usage_quotas/index.html.haml | 1 + .../shared/_mobile_clone_panel.html.haml | 2 +- .../issues_prometheus_alert_events.yml | 2 + ...s_self_managed_prometheus_alert_events.yml | 2 + .../prometheus_alert_events.yml | 2 + .../prometheus_alerts.yml | 2 + .../prometheus_metrics.yml | 2 + .../self_managed_prometheus_alert_events.yml | 2 + ...ability_column_to_sbom_occurances_table.rb | 16 ++ ..._participants_widget_to_work_item_types.rb | 31 +-- ...es_prometheus_alert_events_foreign_keys.rb | 41 ++++ ...414_drop_issues_prometheus_alert_events.rb | 38 ++++ ...es_prometheus_alert_events_foreign_keys.rb | 41 ++++ ..._managed_issues_prometheus_alert_events.rb | 39 ++++ ...op_prometheus_alert_events_foreign_keys.rb | 41 ++++ ...0903222609_drop_prometheus_alert_events.rb | 54 +++++ ...ed_prometheus_alert_events_foreign_keys.rb | 40 ++++ ...op_self_managed_prometheus_alert_events.rb | 58 ++++++ ...645_drop_prometheus_alerts_foreign_keys.rb | 68 ++++++ .../20240903222651_drop_prometheus_alerts.rb | 62 ++++++ ...09_drop_prometheus_metrics_foreign_keys.rb | 27 +++ .../20240903222710_drop_prometheus_metrics.rb | 77 +++++++ db/schema_migrations/20240805081832 | 1 + db/schema_migrations/20240903222413 | 1 + db/schema_migrations/20240903222414 | 1 + db/schema_migrations/20240903222526 | 1 + db/schema_migrations/20240903222527 | 1 + db/schema_migrations/20240903222608 | 1 + db/schema_migrations/20240903222609 | 1 + db/schema_migrations/20240903222629 | 1 + db/schema_migrations/20240903222630 | 1 + db/schema_migrations/20240903222645 | 1 + db/schema_migrations/20240903222651 | 1 + db/schema_migrations/20240903222709 | 1 + db/schema_migrations/20240903222710 | 1 + db/structure.sql | 196 +----------------- .../install_infrastructure.md | 12 +- doc/api/graphql/reference/index.md | 2 + lib/gitlab/git_post_receive.rb | 1 + lib/gitlab/prometheus_client.rb | 1 + lib/gitlab/spamcheck/result.rb | 1 + lib/gitlab/user_access_snippet.rb | 1 + lib/gitlab/view/presenter/delegated.rb | 1 + .../incoming_email/mail_room_enabled_check.rb | 1 + .../incoming_email/mail_room_running_check.rb | 1 + qa/qa/page/organization/new.rb | 1 + qa/qa/page/organization/show.rb | 1 + qa/qa/page/project/issue/show.rb | 1 + qa/qa/page/project/snippet/new.rb | 1 + qa/qa/resource/base.rb | 1 + qa/qa/scenario/test/instance/airgapped.rb | 1 + spec/db/schema_spec.rb | 1 + .../callouts/registration_enabled_spec.rb | 6 +- ...icipants_widget_to_work_item_types_spec.rb | 11 - spec/models/operations/feature_flag_spec.rb | 10 + .../merge_requests/update_service_spec.rb | 6 + 73 files changed, 725 insertions(+), 296 deletions(-) rename db/docs/{ => deleted_tables}/issues_prometheus_alert_events.yml (80%) rename db/docs/{ => deleted_tables}/issues_self_managed_prometheus_alert_events.yml (81%) rename db/docs/{ => deleted_tables}/prometheus_alert_events.yml (76%) rename db/docs/{ => deleted_tables}/prometheus_alerts.yml (78%) rename db/docs/{ => deleted_tables}/prometheus_metrics.yml (74%) rename db/docs/{ => deleted_tables}/self_managed_prometheus_alert_events.yml (77%) create mode 100644 db/migrate/20240805081832_add_reachability_column_to_sbom_occurances_table.rb create mode 100644 db/post_migrate/20240903222413_drop_issues_prometheus_alert_events_foreign_keys.rb create mode 100644 db/post_migrate/20240903222414_drop_issues_prometheus_alert_events.rb create mode 100644 db/post_migrate/20240903222526_drop_self_managed_issues_prometheus_alert_events_foreign_keys.rb create mode 100644 db/post_migrate/20240903222527_drop_self_managed_issues_prometheus_alert_events.rb create mode 100644 db/post_migrate/20240903222608_drop_prometheus_alert_events_foreign_keys.rb create mode 100644 db/post_migrate/20240903222609_drop_prometheus_alert_events.rb create mode 100644 db/post_migrate/20240903222629_drop_self_managed_prometheus_alert_events_foreign_keys.rb create mode 100644 db/post_migrate/20240903222630_drop_self_managed_prometheus_alert_events.rb create mode 100644 db/post_migrate/20240903222645_drop_prometheus_alerts_foreign_keys.rb create mode 100644 db/post_migrate/20240903222651_drop_prometheus_alerts.rb create mode 100644 db/post_migrate/20240903222709_drop_prometheus_metrics_foreign_keys.rb create mode 100644 db/post_migrate/20240903222710_drop_prometheus_metrics.rb create mode 100644 db/schema_migrations/20240805081832 create mode 100644 db/schema_migrations/20240903222413 create mode 100644 db/schema_migrations/20240903222414 create mode 100644 db/schema_migrations/20240903222526 create mode 100644 db/schema_migrations/20240903222527 create mode 100644 db/schema_migrations/20240903222608 create mode 100644 db/schema_migrations/20240903222609 create mode 100644 db/schema_migrations/20240903222629 create mode 100644 db/schema_migrations/20240903222630 create mode 100644 db/schema_migrations/20240903222645 create mode 100644 db/schema_migrations/20240903222651 create mode 100644 db/schema_migrations/20240903222709 create mode 100644 db/schema_migrations/20240903222710 delete mode 100644 spec/migrations/20240812081354_add_email_participants_widget_to_work_item_types_spec.rb diff --git a/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml b/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml index 24131207924..b595779e1cd 100644 --- a/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml @@ -155,7 +155,6 @@ gitaly-transactions: KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/3_create/**/*_spec.rb" QA_GITALY_TRANSACTIONS_ENABLED: "true" rules: - - !reference [.rules:test:smoke-for-omnibus-mr, rules] - !reference [.rules:test:qa-parallel, rules] - if: $QA_SUITES =~ /Test::Instance::All/ @@ -242,7 +241,6 @@ git-sha256-repositories: QA_USE_SHA256_REPOSITORY_OBJECT_STORAGE: true GITLAB_QA_OPTS: "--enable-feature support_sha256_repositories" rules: - - !reference [.rules:test:smoke-for-omnibus-mr, rules] - !reference [.rules:test:feature-flags-set, rules] - !reference [.rules:test:qa-parallel, rules] - if: $QA_SUITES =~ /Test::Instance::All/ diff --git a/.rubocop_todo/layout/line_break_after_final_mixin.yml b/.rubocop_todo/layout/line_break_after_final_mixin.yml index 1822c63474c..2bcce88d265 100644 --- a/.rubocop_todo/layout/line_break_after_final_mixin.yml +++ b/.rubocop_todo/layout/line_break_after_final_mixin.yml @@ -130,18 +130,3 @@ Layout/LineBreakAfterFinalMixin: - 'lib/gitlab/ci/config/interpolation/config.rb' - 'lib/gitlab/cluster/rack_timeout_observer.rb' - 'lib/gitlab/etag_caching/router/graphql.rb' - - 'lib/gitlab/git_post_receive.rb' - - 'lib/gitlab/prometheus_client.rb' - - 'lib/gitlab/spamcheck/result.rb' - - 'lib/gitlab/user_access_snippet.rb' - - 'lib/gitlab/view/presenter/delegated.rb' - - 'lib/system_check/incoming_email/mail_room_enabled_check.rb' - - 'lib/system_check/incoming_email/mail_room_running_check.rb' - - 'qa/qa/ee/page/workspace/new.rb' - - 'qa/qa/ee/scenario/test/integration/group_saml.rb' - - 'qa/qa/page/organization/new.rb' - - 'qa/qa/page/organization/show.rb' - - 'qa/qa/page/project/issue/show.rb' - - 'qa/qa/page/project/snippet/new.rb' - - 'qa/qa/resource/base.rb' - - 'qa/qa/scenario/test/instance/airgapped.rb' diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue index 66e7102dc84..4ce8676fda0 100644 --- a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue +++ b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue @@ -338,16 +338,6 @@ export default { required /> - - - - + + + + -
+
{{ absoluteLineOffset[0] }}
-
+
{{ absoluteLineOffset[1] }}
-
+