From 2a501f63df96252295df7efe53880c5e78fa22b5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 7 Dec 2022 15:07:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/rspec/leaky_constant_declaration.yml | 3 - app/assets/javascripts/monitoring/csv_export.js | 2 +- .../components/mr_widget_related_links.vue | 6 +- app/assets/stylesheets/framework/common.scss | 4 +- app/assets/stylesheets/framework/filters.scss | 2 +- app/assets/stylesheets/framework/variables.scss | 11 - app/assets/stylesheets/page_bundles/settings.scss | 209 +++++++++++++++++++ app/assets/stylesheets/pages/colors.scss | 8 + app/assets/stylesheets/pages/settings.scss | 228 +-------------------- app/controllers/application_controller.rb | 2 +- app/controllers/groups/usage_quotas_controller.rb | 6 - app/controllers/projects/clusters_controller.rb | 1 - .../projects/environments_controller.rb | 2 - .../projects/metrics_dashboard_controller.rb | 3 - app/graphql/mutations/work_items/create.rb | 2 + .../types/work_items/widgets/hierarchy_type.rb | 18 ++ app/models/ci/build.rb | 13 +- app/models/ci/sources/pipeline.rb | 15 ++ app/models/concerns/ci/partitionable.rb | 30 ++- .../ci/partitionable/partitioned_filter.rb | 41 ++++ app/models/work_items/parent_link.rb | 2 + .../ci/create_downstream_pipeline_service.rb | 21 +- .../obtain_lets_encrypt_certificate_service.rb | 2 +- .../appearances/show.html.haml | 1 + .../admin/application_settings/ci_cd.html.haml | 1 + .../admin/application_settings/general.html.haml | 1 + .../application_settings/integrations.html.haml | 1 + .../metrics_and_profiling.html.haml | 1 + .../admin/application_settings/network.html.haml | 1 + .../application_settings/preferences.html.haml | 1 + .../admin/application_settings/reporting.html.haml | 1 + .../application_settings/repository.html.haml | 1 + .../service_usage_data.html.haml | 1 + app/views/admin/dashboard/index.html.haml | 9 +- app/views/ci/variables/_variable_row.html.haml | 3 +- .../groups/settings/applications/index.html.haml | 1 + app/views/layouts/group_settings.html.haml | 1 + app/views/layouts/project_settings.html.haml | 1 + .../ci/create_downstream_pipeline_worker.rb | 8 +- config/application.rb | 1 + .../ci_assign_job_token_on_scheduling.yml | 8 - ...un_bridge_for_pipeline_duration_calculation.yml | 8 + .../development/prometheus_computed_alerts.yml | 8 - config/gitlab.yml.example | 2 +- .../metrics/counts_all/20210204124930_servers.yml | 2 +- .../metrics/counts_all/20210204124932_clusters.yml | 2 +- .../metrics/counts_all/20210216181051_vendor.yml | 2 +- config/metrics/settings/20210216175609_version.yml | 2 +- .../settings/20210216180314_gitpod_enabled.yml | 2 +- ...d_source_partition_id_to_ci_sources_pipeline.rb | 9 + db/schema_migrations/20221128123514 | 1 + db/structure.sql | 3 +- doc/api/graphql/reference/index.md | 4 + doc/user/project/import/github.md | 13 +- doc/user/project/service_desk.md | 75 ++++--- lib/api/files.rb | 16 +- lib/gitlab/auth/ldap/dn.rb | 4 +- lib/gitlab/ci/pipeline/chain/build/associations.rb | 3 +- lib/gitlab/email/receiver.rb | 2 +- lib/gitlab/jwt_authenticatable.rb | 2 +- lib/gitlab/metrics/requests_rack_middleware.rb | 13 +- lib/gitlab/rack_attack.rb | 2 +- lib/gitlab/utils/sanitize_node_link.rb | 2 +- locale/gitlab.pot | 2 +- spec/db/schema_spec.rb | 2 +- spec/factories/ci/pipelines.rb | 1 + spec/factories/ci/sources/pipelines.rb | 4 +- .../clusters_list/components/agents_spec.js | 39 ++-- .../groups/components/overview_tabs_spec.js | 7 +- .../components/widget/widget_spec.js | 4 +- .../work_items/widgets/hierarchy_type_spec.rb | 4 +- .../ci/pipeline/chain/build/associations_spec.rb | 5 +- .../metrics/requests_rack_middleware_spec.rb | 43 ++-- spec/models/ci/build_spec.rb | 16 -- spec/models/ci/sources/pipeline_spec.rb | 18 +- .../ci/partitionable/partitioned_filter_spec.rb | 80 ++++++++ spec/models/concerns/ci/partitionable_spec.rb | 24 +++ spec/models/concerns/triggerable_hooks_spec.rb | 6 +- spec/models/repository_spec.rb | 4 +- spec/models/work_items/parent_link_spec.rb | 19 ++ spec/requests/api/files_spec.rb | 57 ++++++ .../api/graphql/project/work_items_spec.rb | 51 +++++ spec/requests/api/graphql/work_item_spec.rb | 10 +- .../ci/create_downstream_pipeline_service_spec.rb | 139 ++++++++----- .../cross_project_pipeline_spec.rb | 2 +- .../parent_child_pipeline_spec.rb | 2 +- spec/services/ci/pipeline_trigger_service_spec.rb | 3 +- .../ci/log_downstream_pipeline_shared_examples.rb | 6 +- .../issuable_quick_actions_shared_examples.rb | 30 +-- .../ci/create_downstream_pipeline_worker_spec.rb | 43 +++- vendor/gems/attr_encrypted/README.md | 2 +- workhorse/internal/api/api.go | 6 +- workhorse/internal/api/channel_settings.go | 7 +- workhorse/internal/builds/register.go | 5 +- .../internal/dependencyproxy/dependencyproxy.go | 2 +- workhorse/internal/helper/helpers.go | 10 - workhorse/internal/proxy/proxy.go | 35 ++-- workhorse/main_test.go | 6 +- 98 files changed, 982 insertions(+), 562 deletions(-) create mode 100644 app/assets/stylesheets/page_bundles/settings.scss create mode 100644 app/models/concerns/ci/partitionable/partitioned_filter.rb delete mode 100644 config/feature_flags/development/ci_assign_job_token_on_scheduling.yml create mode 100644 config/feature_flags/development/ci_run_bridge_for_pipeline_duration_calculation.yml delete mode 100644 config/feature_flags/development/prometheus_computed_alerts.yml create mode 100644 db/migrate/20221128123514_add_source_partition_id_to_ci_sources_pipeline.rb create mode 100644 db/schema_migrations/20221128123514 create mode 100644 spec/models/concerns/ci/partitionable/partitioned_filter_spec.rb diff --git a/.rubocop_todo/rspec/leaky_constant_declaration.yml b/.rubocop_todo/rspec/leaky_constant_declaration.yml index 34380589905..f05805adeb5 100644 --- a/.rubocop_todo/rspec/leaky_constant_declaration.yml +++ b/.rubocop_todo/rspec/leaky_constant_declaration.yml @@ -9,6 +9,3 @@ RSpec/LeakyConstantDeclaration: - 'spec/models/concerns/batch_destroy_dependent_associations_spec.rb' - 'spec/models/concerns/bulk_insert_safe_spec.rb' - 'spec/models/concerns/bulk_insertable_associations_spec.rb' - - 'spec/models/concerns/triggerable_hooks_spec.rb' - - 'spec/models/repository_spec.rb' - - 'spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb' diff --git a/app/assets/javascripts/monitoring/csv_export.js b/app/assets/javascripts/monitoring/csv_export.js index eaeed4a54d4..7e15b659767 100644 --- a/app/assets/javascripts/monitoring/csv_export.js +++ b/app/assets/javascripts/monitoring/csv_export.js @@ -110,7 +110,7 @@ const csvData = (metricHeaders, metricValues) => { // "If double-quotes are used to enclose fields, then a double-quote // appearing inside a field must be escaped by preceding it with // another double quote." - // https://tools.ietf.org/html/rfc4180#page-2 + // https://www.rfc-editor.org/rfc/rfc4180#page-2 const headers = metricHeaders.map((header) => `"${header.replace(/"/g, '""')}"`); return { diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue index 92f8351b0a0..1fd1e264c25 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue @@ -55,16 +55,16 @@ export default {