From 115c175a7dffe4e0a2c0786776ef2e94e9bf6444 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 25 Jul 2024 12:11:40 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../main.gitlab-ci.yml | 14 + .../ci/package-and-test/main.gitlab-ci.yml | 16 + .yamllint | 3 - GITALY_SERVER_VERSION | 2 +- .../components/form_custom_headers.vue | 26 +- app/components/layouts/crud_component.haml | 2 +- app/components/layouts/crud_component.rb | 4 +- .../layouts/settings_section_component.rb | 4 +- app/controllers/application_controller.rb | 4 +- app/models/organizations/organization.rb | 2 +- app/models/organizations/organization_user.rb | 1 + app/models/snippet.rb | 3 + .../bulk_imports/file_download_service.rb | 10 +- app/views/admin/applications/index.html.haml | 7 +- app/views/admin/hooks/edit.html.haml | 22 +- app/views/admin/hooks/index.html.haml | 8 +- .../settings/applications/edit.html.haml | 2 +- .../settings/applications/show.html.haml | 4 +- app/views/projects/hooks/edit.html.haml | 23 +- app/views/projects/hooks/index.html.haml | 9 +- .../doorkeeper/applications/_index.html.haml | 173 +++-- app/views/shared/file_hooks/_index.html.haml | 13 +- .../shared/web_hooks/_description.html.haml | 7 + app/views/shared/web_hooks/_index.html.haml | 3 +- .../web_hooks/_title_and_docs.html.haml | 12 - db/fixtures/development/12_snippets.rb | 1 + .../20240719094108_change_snippets_default.rb | 11 + .../20240724181016_drop_orphaned_sequences.rb | 56 ++ db/schema_migrations/20240719094108 | 1 + db/schema_migrations/20240724181016 | 1 + db/structure.sql | 2 +- doc/api/search.md | 281 ++++---- .../testing_guide/unhealthy_tests.md | 27 +- .../responding_to_security_incidents.md | 74 +- doc/user/compliance/audit_event_types.md | 670 +++++++++--------- lib/gitlab/alert_management/payload/base.rb | 4 - lib/gitlab/current/organization.rb | 19 +- qa/qa/git/repository.rb | 4 +- qa/qa/resource/project.rb | 6 +- qa/qa/runtime/env.rb | 4 + .../components/layouts/crud_component_spec.rb | 24 +- spec/factories/snippets.rb | 1 + spec/features/boards/board_filters_spec.rb | 4 +- .../profiles/oauth_applications_spec.rb | 40 +- .../metrics/dashboard/broken_yml_syntax.yml | 13 - ...hboard_groups_missing_panels_and_group.yml | 33 - .../dashboard/dashboard_is_an_array.yml | 15 - .../dashboard_missing_panel_groups.yml | 32 - .../dashboard_panel_is_missing_metrics.yml | 15 - ...hboard_panle_groups_wrong_content_type.yml | 33 - .../metrics/dashboard/development_metrics.yml | 39 - .../dashboard/duplicate_id_dashboard.yml | 67 -- .../metrics/dashboard/invalid_dashboard.yml | 67 -- .../metrics/dashboard/sample_dashboard.yml | 72 -- .../metrics/dashboard/schemas/axis.json | 11 - .../schemas/custom_variable_full_syntax.json | 13 - .../schemas/custom_variable_options.json | 12 - .../schemas/custom_variable_values.json | 11 - .../metrics/dashboard/schemas/dashboard.json | 20 - .../dashboard/schemas/embedded_dashboard.json | 14 - .../schemas/embedded_panel_groups.json | 12 - .../metrics/dashboard/schemas/links.json | 10 - ...ric_label_values_variable_full_syntax.json | 22 - .../metric_label_values_variable_options.json | 13 - .../metrics/dashboard/schemas/metrics.json | 58 -- .../dashboard/schemas/panel_groups.json | 17 - .../metrics/dashboard/schemas/panels.json | 22 - .../metrics/dashboard/schemas/templating.json | 9 - .../schemas/text_variable_full_syntax.json | 13 - .../schemas/text_variable_options.json | 8 - .../metrics/dashboard/schemas/variables.json | 19 - .../alert_management/payload/base_spec.rb | 2 - spec/lib/gitlab/current/organization_spec.rb | 14 + .../organizations/organization_user_spec.rb | 17 + .../file_download_service_spec.rb | 25 +- ...nqueue_pipelines_to_unlock_service_spec.rb | 7 +- .../helpers/metrics_dashboard_helpers.rb | 44 -- .../manage_applications_shared_examples.rb | 4 +- .../projects/hooks/edit.html.haml_spec.rb | 2 +- .../projects/hooks/index.html.haml_spec.rb | 2 +- ...delete_stale_direct_uploads_worker_spec.rb | 64 +- .../generate_distribution_worker_spec.rb | 4 +- .../docs/templates/audit_event_types.md.erb | 2 +- 83 files changed, 975 insertions(+), 1486 deletions(-) create mode 100644 app/views/shared/web_hooks/_description.html.haml delete mode 100644 app/views/shared/web_hooks/_title_and_docs.html.haml create mode 100644 db/post_migrate/20240719094108_change_snippets_default.rb create mode 100644 db/post_migrate/20240724181016_drop_orphaned_sequences.rb create mode 100644 db/schema_migrations/20240719094108 create mode 100644 db/schema_migrations/20240724181016 delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/broken_yml_syntax.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/dashboard_groups_missing_panels_and_group.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/dashboard_is_an_array.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/dashboard_missing_panel_groups.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/dashboard_panel_is_missing_metrics.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/dashboard_panle_groups_wrong_content_type.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/development_metrics.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/duplicate_id_dashboard.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/invalid_dashboard.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_values.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_options.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json delete mode 100644 spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json delete mode 100644 spec/support/helpers/metrics_dashboard_helpers.rb diff --git a/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml b/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml index 1d65a826022..58366f3b434 100644 --- a/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml @@ -199,6 +199,20 @@ gitlab-pages: - if: $QA_SUITES =~ /Test::Instance::GitlabPages/ - !reference [.rules:test:manual, rules] +# ========== git sha256 enabled =========== +git-sha256-repositories: + when: manual + extends: + - .parallel + - .qa + variables: + QA_SCENARIO: Test::Instance::Image + QA_USE_SHA256_REPOSITORY_OBJECT_STORAGE: true + GITLAB_QA_OPTS: "--enable-feature support_sha256_repositories" + rules: + - !reference [.rules:test:qa-parallel, rules] + - if: $QA_SUITES =~ /Test::Instance::All/ + # ========================================== # Post test stage # ========================================== diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 6754c0bf6e8..50ee368e2fa 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -192,6 +192,22 @@ gitaly-transactions-selective-parallel: variables: QA_TESTS: "" +# ========== git sha256 enabled =========== +git-sha256-repositories: + when: manual + extends: + - .parallel + - .qa + parallel: 5 + variables: + QA_SCENARIO: Test::Instance::Image + 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/ # ------------------------------------------ # Non parallel jobs # ------------------------------------------ diff --git a/.yamllint b/.yamllint index 6547a1f7da6..1d9bcb32a3b 100644 --- a/.yamllint +++ b/.yamllint @@ -27,9 +27,6 @@ ignore: | # Has some special indentation doc/user/project/integrations/samples/cloudwatch.yml - # Broken on purpose (for testing) - spec/fixtures/lib/gitlab/metrics/dashboard/broken_yml_syntax.yml - # Dynamic YAML files have syntax errors sometimes. *.erb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a26972eac75..979e4468f80 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -e9200d13237f94877ae69dd6391b23d5ca1402e8 +67840bedbf1fda223cbb9ebae021db71c31b69aa diff --git a/app/assets/javascripts/webhooks/components/form_custom_headers.vue b/app/assets/javascripts/webhooks/components/form_custom_headers.vue index df5f06372c7..65d95d86a4f 100644 --- a/app/assets/javascripts/webhooks/components/form_custom_headers.vue +++ b/app/assets/javascripts/webhooks/components/form_custom_headers.vue @@ -1,8 +1,9 @@