From 611897b987d439b0d736eb87415b8ca32bdaa282 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Nov 2023 00:10:33 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/docs.gitlab-ci.yml | 2 +- .../ci/gitlab-com/danger-review.gitlab-ci.yml | 2 +- .rubocop_todo/layout/argument_alignment.yml | 14 -- .../style/percent_literal_delimiters.yml | 57 ----- .../admin_runners/admin_runners_app.vue | 15 +- .../runner/components/runner_list_header.vue | 17 ++ .../group_runners/group_runners_app.vue | 15 +- .../merge_request_context_commit_diff_file.rb | 1 - app/models/merge_request_diff_commit.rb | 5 +- app/models/system_note_metadata.rb | 1 + app/services/ml/update_model_service.rb | 16 ++ .../vs_code/settings/delete_service.rb | 21 ++ .../claude_description_generation.yml | 8 + .../reduce_duplicate_job_key_ttl.yml | 8 + .../development/use_gitlab_http_v2.yml | 2 +- config/initializers/wikicloth_redos_patch.rb | 2 +- ...rsion_of_system_note_metadata_to_bigint.rb | 18 ++ ..._note_metadata_id_for_bigint_conversion.rb | 18 ++ ...ries_columns_from_geo_node_status_table.rb | 34 +++ db/schema_migrations/20231027052949 | 1 + db/schema_migrations/20231027060443 | 1 + db/schema_migrations/20231105165706 | 1 + db/structure.sql | 22 +- .../reference_architectures/10k_users.md | 38 ++- .../reference_architectures/1k_users.md | 37 ++- .../reference_architectures/25k_users.md | 38 ++- .../reference_architectures/2k_users.md | 30 ++- .../reference_architectures/3k_users.md | 40 +++- .../reference_architectures/50k_users.md | 38 ++- .../reference_architectures/5k_users.md | 41 +++- .../reference_architectures/index.md | 91 ++++--- .../settings/usage_statistics.md | 1 + doc/install/relative_url.md | 2 +- lib/api/ml/mlflow/registered_models.rb | 27 +++ .../vs_code/settings/vs_code_settings_sync.rb | 13 + .../duplicate_jobs/duplicate_job.rb | 11 +- .../deduplicates_when_scheduling.rb | 2 +- lib/vs_code/settings.rb | 2 +- locale/gitlab.pot | 3 + qa/qa/page/main/login.rb | 2 +- scripts/internal_events/monitor.rb | 13 +- spec/factories/ci/build_trace_chunks.rb | 16 ++ .../fixtures/api/schemas/ml/update_model.json | 51 ++++ .../components/runner_list_header_spec.js | 31 +++ .../gitlab/ci/badge/pipeline/status_spec.rb | 5 +- .../ci/build/artifacts/metadata/entry_spec.rb | 20 +- spec/lib/gitlab/ci/build/hook_spec.rb | 6 +- .../gitlab/ci/build/policy/changes_spec.rb | 53 +++-- .../gitlab/ci/build/policy/variables_spec.rb | 35 ++- .../build/rules/rule/clause/changes_spec.rb | 7 +- .../lib/gitlab/ci/config/entry/bridge_spec.rb | 56 +++-- spec/lib/gitlab/ci/config/entry/job_spec.rb | 27 ++- .../lib/gitlab/ci/config/entry/policy_spec.rb | 3 +- .../gitlab/ci/config/extendable/entry_spec.rb | 9 +- .../gitlab/ci/config/external/mapper_spec.rb | 12 +- .../gitlab/ci/parsers/security/common_spec.rb | 2 +- .../lib/gitlab/database/tables_locker_spec.rb | 44 ++-- spec/lib/gitlab/other_markup_spec.rb | 25 ++ .../duplicate_jobs/duplicate_job_spec.rb | 16 +- .../ci/build_trace_chunks/redis_spec.rb | 221 +---------------- .../redis_trace_chunks_spec.rb | 12 + spec/requests/api/badges_spec.rb | 2 +- spec/requests/api/ci/jobs_spec.rb | 6 +- spec/requests/api/ci/pipelines_spec.rb | 10 +- .../api/ci/runner/jobs_request_post_spec.rb | 8 +- .../api/ci/runner/runners_post_spec.rb | 4 +- spec/requests/api/ci/triggers_spec.rb | 2 +- .../api/container_repositories_spec.rb | 4 +- spec/requests/api/deployments_spec.rb | 2 +- spec/requests/api/geo_spec.rb | 2 +- .../api/graphql/ci/manual_variables_spec.rb | 2 +- .../api/graphql/gitlab_schema_spec.rb | 6 +- .../group/container_repositories_spec.rb | 4 +- .../api/graphql/group/milestones_spec.rb | 8 +- .../design_management/delete_spec.rb | 10 +- .../graphql/mutations/snippets/create_spec.rb | 4 +- .../mutations/snippets/destroy_spec.rb | 2 +- .../api/graphql/project/base_service_spec.rb | 2 +- .../project/container_repositories_spec.rb | 14 +- .../issue/design_collection/versions_spec.rb | 2 +- .../api/graphql/project/issue_spec.rb | 4 +- .../api/graphql/project/jira_import_spec.rb | 2 +- .../api/graphql/project/jira_projects_spec.rb | 8 +- .../api/graphql/project/release_spec.rb | 24 +- .../graphql/project/terraform/state_spec.rb | 4 +- .../graphql/project/terraform/states_spec.rb | 4 +- spec/requests/api/internal/base_spec.rb | 16 +- .../api/issues/get_group_issues_spec.rb | 2 +- .../api/issues/get_project_issues_spec.rb | 2 +- spec/requests/api/issues/issues_spec.rb | 4 +- .../api/issues/post_projects_issues_spec.rb | 8 +- .../api/issues/put_projects_issues_spec.rb | 2 +- spec/requests/api/merge_requests_spec.rb | 8 +- spec/requests/api/metadata_spec.rb | 8 +- .../api/ml/mlflow/registered_models_spec.rb | 33 +++ .../project_container_repositories_spec.rb | 10 +- spec/requests/api/project_templates_spec.rb | 4 +- spec/requests/api/projects_spec.rb | 8 +- spec/requests/api/releases_spec.rb | 2 +- spec/requests/api/repositories_spec.rb | 6 +- spec/requests/api/search_spec.rb | 4 +- spec/requests/api/settings_spec.rb | 10 +- spec/requests/api/tags_spec.rb | 2 +- .../api/task_completion_status_spec.rb | 16 +- spec/requests/api/unleash_spec.rb | 2 +- spec/requests/api/users_spec.rb | 2 +- .../settings/vs_code_settings_sync_spec.rb | 24 ++ spec/requests/api/wikis_spec.rb | 4 +- spec/requests/jwt_controller_spec.rb | 6 +- spec/requests/lfs_locks_api_spec.rb | 8 +- spec/requests/users_controller_spec.rb | 4 +- spec/routing/uploads_routing_spec.rb | 2 +- .../cop/migration/migration_record_spec.rb | 2 +- .../migration/prevent_index_creation_spec.rb | 2 +- .../migration/sidekiq_queue_migrate_spec.rb | 2 +- .../cop/performance/readlines_each_spec.rb | 2 +- spec/serializers/build_details_entity_spec.rb | 4 +- .../container_repositories_serializer_spec.rb | 2 +- spec/serializers/diff_file_entity_spec.rb | 2 +- spec/serializers/group_child_entity_spec.rb | 6 +- spec/services/ml/update_model_service_spec.rb | 27 +++ .../vs_code/settings/delete_service_spec.rb | 21 ++ .../ci/redis_shared_examples.rb | 222 ++++++++++++++++++ 123 files changed, 1294 insertions(+), 696 deletions(-) create mode 100644 app/assets/javascripts/ci/runner/components/runner_list_header.vue create mode 100644 app/services/ml/update_model_service.rb create mode 100644 app/services/vs_code/settings/delete_service.rb create mode 100644 config/feature_flags/development/claude_description_generation.yml create mode 100644 config/feature_flags/development/reduce_duplicate_job_key_ttl.yml create mode 100644 db/migrate/20231027052949_initialize_conversion_of_system_note_metadata_to_bigint.rb create mode 100644 db/post_migrate/20231027060443_backfill_system_note_metadata_id_for_bigint_conversion.rb create mode 100644 db/post_migrate/20231105165706_drop_repositories_columns_from_geo_node_status_table.rb create mode 100644 db/schema_migrations/20231027052949 create mode 100644 db/schema_migrations/20231027060443 create mode 100644 db/schema_migrations/20231105165706 create mode 100644 spec/fixtures/api/schemas/ml/update_model.json create mode 100644 spec/frontend/ci/runner/components/runner_list_header_spec.js create mode 100644 spec/models/ci/build_trace_chunks/redis_trace_chunks_spec.rb create mode 100644 spec/services/ml/update_model_service_spec.rb create mode 100644 spec/services/vs_code/settings/delete_service_spec.rb create mode 100644 spec/support/shared_examples/ci/redis_shared_examples.rb diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 0c39fac84e9..6d2616557d4 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -42,7 +42,7 @@ review-docs-cleanup: docs-lint links: extends: - .docs:rules:docs-lint - image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-html:alpine-3.18-ruby-3.2.2-6a53d93b + image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-html:alpine-3.18-ruby-3.2.2-08fa6df8 stage: lint needs: [] script: diff --git a/.gitlab/ci/gitlab-com/danger-review.gitlab-ci.yml b/.gitlab/ci/gitlab-com/danger-review.gitlab-ci.yml index cad12b8b5cb..8328051f1a0 100644 --- a/.gitlab/ci/gitlab-com/danger-review.gitlab-ci.yml +++ b/.gitlab/ci/gitlab-com/danger-review.gitlab-ci.yml @@ -1,6 +1,6 @@ include: - project: gitlab-org/quality/pipeline-common - ref: 7.10.2 + ref: 7.10.3 file: - /ci/danger-review.yml diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index 5173e67b843..e9a23d2ca7e 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -1412,20 +1412,6 @@ Layout/ArgumentAlignment: - 'spec/lib/gitlab/changelog/config_spec.rb' - 'spec/lib/gitlab/checks/changes_access_spec.rb' - 'spec/lib/gitlab/checks/single_change_access_spec.rb' - - 'spec/lib/gitlab/ci/badge/pipeline/status_spec.rb' - - 'spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb' - - 'spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb' - - 'spec/lib/gitlab/ci/build/hook_spec.rb' - - 'spec/lib/gitlab/ci/build/policy/changes_spec.rb' - - 'spec/lib/gitlab/ci/build/policy/variables_spec.rb' - - 'spec/lib/gitlab/ci/build/rules/rule/clause/changes_spec.rb' - - 'spec/lib/gitlab/ci/config/entry/bridge_spec.rb' - - 'spec/lib/gitlab/ci/config/entry/job_spec.rb' - - 'spec/lib/gitlab/ci/config/entry/policy_spec.rb' - - 'spec/lib/gitlab/ci/config/extendable/entry_spec.rb' - - 'spec/lib/gitlab/ci/config/external/mapper_spec.rb' - - 'spec/lib/gitlab/ci/config/external/rules_spec.rb' - - 'spec/lib/gitlab/ci/parsers/security/common_spec.rb' - 'spec/lib/gitlab/ci/pipeline/chain/command_spec.rb' - 'spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb' - 'spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb' diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml index b90c925d976..79be3e866c5 100644 --- a/.rubocop_todo/style/percent_literal_delimiters.yml +++ b/.rubocop_todo/style/percent_literal_delimiters.yml @@ -3,63 +3,6 @@ Style/PercentLiteralDelimiters: Exclude: - 'metrics_server/metrics_server.rb' - - 'spec/requests/api/badges_spec.rb' - - 'spec/requests/api/ci/jobs_spec.rb' - - 'spec/requests/api/ci/pipelines_spec.rb' - - 'spec/requests/api/ci/runner/jobs_request_post_spec.rb' - - 'spec/requests/api/ci/runner/runners_post_spec.rb' - - 'spec/requests/api/ci/triggers_spec.rb' - - 'spec/requests/api/container_repositories_spec.rb' - - 'spec/requests/api/deployments_spec.rb' - - 'spec/requests/api/geo_spec.rb' - - 'spec/requests/api/graphql/ci/manual_variables_spec.rb' - - 'spec/requests/api/graphql/gitlab_schema_spec.rb' - - 'spec/requests/api/graphql/group/container_repositories_spec.rb' - - 'spec/requests/api/graphql/group/milestones_spec.rb' - - 'spec/requests/api/graphql/mutations/design_management/delete_spec.rb' - - 'spec/requests/api/graphql/mutations/snippets/create_spec.rb' - - 'spec/requests/api/graphql/mutations/snippets/destroy_spec.rb' - - 'spec/requests/api/graphql/project/base_service_spec.rb' - - 'spec/requests/api/graphql/project/container_repositories_spec.rb' - - 'spec/requests/api/graphql/project/issue/design_collection/versions_spec.rb' - - 'spec/requests/api/graphql/project/issue_spec.rb' - - 'spec/requests/api/graphql/project/jira_import_spec.rb' - - 'spec/requests/api/graphql/project/jira_projects_spec.rb' - - 'spec/requests/api/graphql/project/release_spec.rb' - - 'spec/requests/api/graphql/project/terraform/state_spec.rb' - - 'spec/requests/api/graphql/project/terraform/states_spec.rb' - - 'spec/requests/api/internal/base_spec.rb' - - 'spec/requests/api/issues/get_group_issues_spec.rb' - - 'spec/requests/api/issues/get_project_issues_spec.rb' - - 'spec/requests/api/issues/issues_spec.rb' - - 'spec/requests/api/issues/post_projects_issues_spec.rb' - - 'spec/requests/api/issues/put_projects_issues_spec.rb' - - 'spec/requests/api/merge_requests_spec.rb' - - 'spec/requests/api/metadata_spec.rb' - - 'spec/requests/api/project_container_repositories_spec.rb' - - 'spec/requests/api/project_templates_spec.rb' - - 'spec/requests/api/projects_spec.rb' - - 'spec/requests/api/releases_spec.rb' - - 'spec/requests/api/repositories_spec.rb' - - 'spec/requests/api/search_spec.rb' - - 'spec/requests/api/settings_spec.rb' - - 'spec/requests/api/tags_spec.rb' - - 'spec/requests/api/task_completion_status_spec.rb' - - 'spec/requests/api/unleash_spec.rb' - - 'spec/requests/api/users_spec.rb' - - 'spec/requests/api/wikis_spec.rb' - - 'spec/requests/jwt_controller_spec.rb' - - 'spec/requests/lfs_locks_api_spec.rb' - - 'spec/requests/users_controller_spec.rb' - - 'spec/routing/uploads_routing_spec.rb' - - 'spec/rubocop/cop/migration/migration_record_spec.rb' - - 'spec/rubocop/cop/migration/prevent_index_creation_spec.rb' - - 'spec/rubocop/cop/migration/sidekiq_queue_migrate_spec.rb' - - 'spec/rubocop/cop/performance/readlines_each_spec.rb' - - 'spec/serializers/build_details_entity_spec.rb' - - 'spec/serializers/container_repositories_serializer_spec.rb' - - 'spec/serializers/diff_file_entity_spec.rb' - - 'spec/serializers/group_child_entity_spec.rb' - 'spec/services/award_emojis/copy_service_spec.rb' - 'spec/services/bulk_imports/file_download_service_spec.rb' - 'spec/services/bulk_imports/lfs_objects_export_service_spec.rb' diff --git a/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue b/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue index 48c088f3a29..3340bc1beb9 100644 --- a/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue +++ b/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue @@ -14,6 +14,7 @@ import { import allRunnersQuery from 'ee_else_ce/ci/runner/graphql/list/all_runners.query.graphql'; import allRunnersCountQuery from 'ee_else_ce/ci/runner/graphql/list/all_runners_count.query.graphql'; +import RunnerListHeader from '../components/runner_list_header.vue'; import RegistrationDropdown from '../components/registration/registration_dropdown.vue'; import RunnerFilteredSearchBar from '../components/runner_filtered_search_bar.vue'; import RunnerList from '../components/runner_list.vue'; @@ -42,6 +43,7 @@ export default { components: { GlButton, GlLink, + RunnerListHeader, RegistrationDropdown, RunnerFilteredSearchBar, RunnerList, @@ -175,11 +177,9 @@ export default {