From 430502c6d3ac69a48f07482dbe8e866a21b70f3d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 25 Jun 2024 15:28:32 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/gitlab/bounded_contexts.yml | 3 - .rubocop_todo/graphql/ordered_fields.yml | 5 - .../graphql/unnecessary_field_alias.yml | 1 - .rubocop_todo/layout/line_length.yml | 1 - .rubocop_todo/rails/strong_params.yml | 17 - .rubocop_todo/rspec/context_wording.yml | 1 - .../rspec/factory_bot/avoid_create.yml | 1 - .rubocop_todo/rspec/named_subject.yml | 3 - .rubocop_todo/rspec/return_from_stub.yml | 1 - .../style/inline_disable_annotation.yml | 2 - CHANGELOG.md | 30 + GITALY_SERVER_VERSION | 2 +- .../gitlab_pages/components/deployment.vue | 310 +++- .../gitlab_pages/components/deployments.vue | 2 +- .../delete_pages_deployment.mutation.graphql | 11 + .../restore_pages_deployment.mutation.graphql | 11 + .../list/components/issues_list_app.vue | 2 + .../components/model_create.vue | 1 + .../components/model_version_create.vue | 1 + .../projects/edit/components/app.vue | 4 +- .../filtered_search_bar_root.vue | 7 +- .../javascripts/vue_shared/constants.js | 9 +- .../list/components/issuable_list_root.vue | 2 +- .../layouts/settings_block_component.haml | 2 +- .../layouts/settings_block_component.rb | 4 +- .../concerns/render_access_tokens.rb | 2 +- app/controllers/concerns/snippets_sort.rb | 2 +- .../concerns/sorting_preference.rb | 8 +- .../concerns/web_hooks/hook_actions.rb | 2 +- .../import/github_groups_controller.rb | 2 +- .../projects/project_members_controller.rb | 4 +- .../settings/repository_controller.rb | 4 +- .../user_settings/user_settings_controller.rb | 2 +- .../types/container_repository_tag_type.rb | 1 + app/graphql/types/merge_request_type.rb | 12 +- app/models/concerns/issuable.rb | 4 +- app/models/concerns/protected_ref_access.rb | 3 - .../protected_ref_deploy_key_access.rb | 7 + app/models/container_repository.rb | 1 + .../integrations/project_test_data.rb | 4 +- app/services/issues/base_service.rb | 5 +- app/services/merge_requests/base_service.rb | 4 +- app/views/dashboard/todos/_todo.html.haml | 2 - app/views/notify/new_review_email.html.haml | 1 - app/views/notify/new_review_email.text.erb | 2 - ...rge_requests_closing_issues_project_id.yml | 9 + .../backfill_ml_model_metadata_project_id.yml | 9 + ...bility_external_issue_links_project_id.yml | 9 + db/docs/merge_requests_closing_issues.yml | 1 + db/docs/ml_model_metadata.yml | 1 + .../vulnerability_external_issue_links.yml | 4 +- ...d_to_vulnerability_external_issue_links.rb | 9 + ...ect_id_to_merge_requests_closing_issues.rb | 9 + ...357_add_project_id_to_ml_model_metadata.rb | 9 + ...lity_external_issue_links_on_project_id.rb | 16 + ...lity_external_issue_links_project_id_fk.rb | 16 + ...external_issue_links_project_id_trigger.rb | 25 + ...ability_external_issue_links_project_id.rb | 40 + ...e_requests_closing_issues_on_project_id.rb | 16 + ...e_requests_closing_issues_project_id_fk.rb | 16 + ...uests_closing_issues_project_id_trigger.rb | 25 + ...erge_requests_closing_issues_project_id.rb | 40 + ...8_index_ml_model_metadata_on_project_id.rb | 16 + ...359_add_ml_model_metadata_project_id_fk.rb | 16 + ...dd_ml_model_metadata_project_id_trigger.rb | 25 + ...e_backfill_ml_model_metadata_project_id.rb | 40 + db/schema_migrations/20240624135059 | 1 + db/schema_migrations/20240624135060 | 1 + db/schema_migrations/20240624135061 | 1 + db/schema_migrations/20240624135062 | 1 + db/schema_migrations/20240624135063 | 1 + db/schema_migrations/20240624142010 | 1 + db/schema_migrations/20240624142011 | 1 + db/schema_migrations/20240624142012 | 1 + db/schema_migrations/20240624142013 | 1 + db/schema_migrations/20240624142014 | 1 + db/schema_migrations/20240624142357 | 1 + db/schema_migrations/20240624142358 | 1 + db/schema_migrations/20240624142359 | 1 + db/schema_migrations/20240624142360 | 1 + db/schema_migrations/20240624142361 | 1 + db/structure.sql | 74 +- doc/api/graphql/reference/index.md | 42 +- doc/api/merge_request_approvals.md | 157 +- .../ai_gateway/decisions/002_proxy.md | 4 +- .../blueprints/work_items/index.md | 2 + doc/integration/saml.md | 13 +- doc/user/gitlab_duo/turn_on_off.md | 1 + doc/user/markdown.md | 13 +- doc/user/packages/yarn_repository/index.md | 12 +- .../lib/gitlab/backup/cli/targets/database.rb | 2 +- lib/container_registry/tag.rb | 1 + ...erge_requests_closing_issues_project_id.rb | 10 + .../backfill_ml_model_metadata_project_id.rb | 10 + ...ability_external_issue_links_project_id.rb | 10 + lib/gitlab/ci/config.rb | 5 +- .../security/validators/schema_validator.rb | 16 +- .../cluster-image-scanning-report-format.json | 1190 +++++++++++++ .../container-scanning-report-format.json | 1123 ++++++++++++ .../coverage-fuzzing-report-format.json | 1100 ++++++++++++ .../schemas/15.1.3/dast-report-format.json | 1505 +++++++++++++++++ .../dependency-scanning-report-format.json | 1111 ++++++++++++ .../schemas/15.1.3/sast-report-format.json | 1095 ++++++++++++ .../secret-detection-report-format.json | 1119 ++++++++++++ .../cluster-image-scanning-report-format.json | 1190 +++++++++++++ .../container-scanning-report-format.json | 1123 ++++++++++++ .../coverage-fuzzing-report-format.json | 1100 ++++++++++++ .../schemas/15.1.4/dast-report-format.json | 1505 +++++++++++++++++ .../dependency-scanning-report-format.json | 1111 ++++++++++++ .../schemas/15.1.4/sast-report-format.json | 1095 ++++++++++++ .../secret-detection-report-format.json | 1119 ++++++++++++ lib/gitlab/ci/pipeline/chain/command.rb | 4 + .../ci/pipeline/chain/config/process.rb | 29 +- lib/gitlab/ci/pipeline/seed/build.rb | 10 - lib/gitlab/ci/yaml_processor.rb | 8 +- lib/gitlab/data_builder/issuable.rb | 3 +- locale/gitlab.pot | 84 +- .../formatters/test_metrics_formatter.rb | 11 +- .../concerns/issuable_collections_spec.rb | 2 +- .../concerns/sorting_preference_spec.rb | 2 +- spec/features/dashboard/issues_spec.rb | 14 + .../components/deployment_spec.js | 202 +++ spec/frontend/gitlab_pages/mock_data.js | 2 +- .../components/model_create_spec.js | 1 + .../components/model_version_create_spec.js | 1 + .../container_repository_tag_type_spec.rb | 2 +- .../projects/ml/model_registry_helper_spec.rb | 2 +- spec/helpers/visibility_level_helper_spec.rb | 56 +- spec/lib/container_registry/tag_spec.rb | 1 + ...requests_closing_issues_project_id_spec.rb | 15 + ...kfill_ml_model_metadata_project_id_spec.rb | 15 + ...ty_external_issue_links_project_id_spec.rb | 15 + spec/lib/gitlab/ci/charts_spec.rb | 82 +- spec/lib/gitlab/data_builder/issuable_spec.rb | 24 +- .../gitlab/suggestions/commit_message_spec.rb | 22 +- .../suggestions/file_suggestion_spec.rb | 28 +- .../gitlab/suggestions/suggestion_set_spec.rb | 20 +- .../tracking/destinations/snowplow_spec.rb | 24 +- spec/lib/gitlab/utils/lazy_attributes_spec.rb | 4 +- spec/lib/gitlab/workhorse_spec.rb | 6 +- .../google_api/cloud_platform/client_spec.rb | 16 +- spec/lib/peek/views/detailed_view_spec.rb | 4 +- spec/lib/security/weak_passwords_spec.rb | 6 +- .../projects/menus/repository_menu_spec.rb | 12 +- spec/lib/uploaded_file_spec.rb | 46 +- ...ty_external_issue_links_project_id_spec.rb | 33 + ...requests_closing_issues_project_id_spec.rb | 33 + ...kfill_ml_model_metadata_project_id_spec.rb | 33 + spec/models/concerns/issuable_spec.rb | 29 +- spec/models/container_repository_spec.rb | 3 +- .../api/ci/runner/jobs_request_post_spec.rb | 2 +- .../protected_ref_access_shared_examples.rb | 77 +- ...d_ref_deploy_key_access_shared_examples.rb | 117 +- spec/tasks/cache_rake_spec.rb | 2 +- spec/tasks/gitlab/cleanup_rake_spec.rb | 22 +- .../rollback/bump_ci_sequences_rake_spec.rb | 2 +- .../db/truncate_legacy_tables_rake_spec.rb | 2 +- spec/tasks/gitlab/sidekiq_rake_spec.rb | 10 +- spec/tooling/danger/sidekiq_queues_spec.rb | 4 +- spec/tooling/graphql/docs/renderer_spec.rb | 176 +- tooling/danger/suggestor.rb | 2 +- 161 files changed, 18469 insertions(+), 580 deletions(-) delete mode 100644 .rubocop_todo/graphql/ordered_fields.yml create mode 100644 app/assets/javascripts/gitlab_pages/queries/delete_pages_deployment.mutation.graphql create mode 100644 app/assets/javascripts/gitlab_pages/queries/restore_pages_deployment.mutation.graphql create mode 100644 db/docs/batched_background_migrations/backfill_merge_requests_closing_issues_project_id.yml create mode 100644 db/docs/batched_background_migrations/backfill_ml_model_metadata_project_id.yml create mode 100644 db/docs/batched_background_migrations/backfill_vulnerability_external_issue_links_project_id.yml create mode 100644 db/migrate/20240624135059_add_project_id_to_vulnerability_external_issue_links.rb create mode 100644 db/migrate/20240624142010_add_project_id_to_merge_requests_closing_issues.rb create mode 100644 db/migrate/20240624142357_add_project_id_to_ml_model_metadata.rb create mode 100644 db/post_migrate/20240624135060_index_vulnerability_external_issue_links_on_project_id.rb create mode 100644 db/post_migrate/20240624135061_add_vulnerability_external_issue_links_project_id_fk.rb create mode 100644 db/post_migrate/20240624135062_add_vulnerability_external_issue_links_project_id_trigger.rb create mode 100644 db/post_migrate/20240624135063_queue_backfill_vulnerability_external_issue_links_project_id.rb create mode 100644 db/post_migrate/20240624142011_index_merge_requests_closing_issues_on_project_id.rb create mode 100644 db/post_migrate/20240624142012_add_merge_requests_closing_issues_project_id_fk.rb create mode 100644 db/post_migrate/20240624142013_add_merge_requests_closing_issues_project_id_trigger.rb create mode 100644 db/post_migrate/20240624142014_queue_backfill_merge_requests_closing_issues_project_id.rb create mode 100644 db/post_migrate/20240624142358_index_ml_model_metadata_on_project_id.rb create mode 100644 db/post_migrate/20240624142359_add_ml_model_metadata_project_id_fk.rb create mode 100644 db/post_migrate/20240624142360_add_ml_model_metadata_project_id_trigger.rb create mode 100644 db/post_migrate/20240624142361_queue_backfill_ml_model_metadata_project_id.rb create mode 100644 db/schema_migrations/20240624135059 create mode 100644 db/schema_migrations/20240624135060 create mode 100644 db/schema_migrations/20240624135061 create mode 100644 db/schema_migrations/20240624135062 create mode 100644 db/schema_migrations/20240624135063 create mode 100644 db/schema_migrations/20240624142010 create mode 100644 db/schema_migrations/20240624142011 create mode 100644 db/schema_migrations/20240624142012 create mode 100644 db/schema_migrations/20240624142013 create mode 100644 db/schema_migrations/20240624142014 create mode 100644 db/schema_migrations/20240624142357 create mode 100644 db/schema_migrations/20240624142358 create mode 100644 db/schema_migrations/20240624142359 create mode 100644 db/schema_migrations/20240624142360 create mode 100644 db/schema_migrations/20240624142361 create mode 100644 lib/gitlab/background_migration/backfill_merge_requests_closing_issues_project_id.rb create mode 100644 lib/gitlab/background_migration/backfill_ml_model_metadata_project_id.rb create mode 100644 lib/gitlab/background_migration/backfill_vulnerability_external_issue_links_project_id.rb create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.3/cluster-image-scanning-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.3/container-scanning-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.3/coverage-fuzzing-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.3/dast-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.3/dependency-scanning-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.3/sast-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.3/secret-detection-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.4/cluster-image-scanning-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.4/container-scanning-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.4/coverage-fuzzing-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.4/dast-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.4/dependency-scanning-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.4/sast-report-format.json create mode 100644 lib/gitlab/ci/parsers/security/validators/schemas/15.1.4/secret-detection-report-format.json create mode 100644 spec/frontend/gitlab_pages/components/deployment_spec.js create mode 100644 spec/lib/gitlab/background_migration/backfill_merge_requests_closing_issues_project_id_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_ml_model_metadata_project_id_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_vulnerability_external_issue_links_project_id_spec.rb create mode 100644 spec/migrations/20240624135063_queue_backfill_vulnerability_external_issue_links_project_id_spec.rb create mode 100644 spec/migrations/20240624142014_queue_backfill_merge_requests_closing_issues_project_id_spec.rb create mode 100644 spec/migrations/20240624142361_queue_backfill_ml_model_metadata_project_id_spec.rb diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml index 0db494d6011..b8a34e664f5 100644 --- a/.rubocop_todo/gitlab/bounded_contexts.yml +++ b/.rubocop_todo/gitlab/bounded_contexts.yml @@ -3186,7 +3186,6 @@ Gitlab/BoundedContexts: - 'ee/app/policies/issuable_metric_image_policy.rb' - 'ee/app/policies/iteration_policy.rb' - 'ee/app/policies/iterations/cadence_policy.rb' - - 'ee/app/policies/merge_request/review_llm_summary_policy.rb' - 'ee/app/policies/merge_request_diff_policy.rb' - 'ee/app/policies/path_lock_policy.rb' - 'ee/app/policies/product_analytics/dashboard_policy.rb' @@ -3327,7 +3326,6 @@ Gitlab/BoundedContexts: - 'ee/app/services/ee/commits/create_service.rb' - 'ee/app/services/ee/deploy_keys/create_service.rb' - 'ee/app/services/ee/deployments/update_environment_service.rb' - - 'ee/app/services/ee/draft_notes/publish_service.rb' - 'ee/app/services/ee/emails/base_service.rb' - 'ee/app/services/ee/emails/confirm_service.rb' - 'ee/app/services/ee/emails/create_service.rb' @@ -3549,7 +3547,6 @@ Gitlab/BoundedContexts: - 'ee/app/services/llm/resolve_vulnerability_service.rb' - 'ee/app/services/llm/review_merge_request_service.rb' - 'ee/app/services/llm/summarize_new_merge_request_service.rb' - - 'ee/app/services/llm/summarize_submitted_review_service.rb' - 'ee/app/services/member_roles/base_service.rb' - 'ee/app/services/member_roles/create_service.rb' - 'ee/app/services/member_roles/delete_service.rb' diff --git a/.rubocop_todo/graphql/ordered_fields.yml b/.rubocop_todo/graphql/ordered_fields.yml deleted file mode 100644 index aa381d11a73..00000000000 --- a/.rubocop_todo/graphql/ordered_fields.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# Cop supports --autocorrect. -GraphQL/OrderedFields: - Exclude: - - 'app/graphql/types/merge_request_type.rb' diff --git a/.rubocop_todo/graphql/unnecessary_field_alias.yml b/.rubocop_todo/graphql/unnecessary_field_alias.yml index 7fe0ebb6c9c..8b4d7469871 100644 --- a/.rubocop_todo/graphql/unnecessary_field_alias.yml +++ b/.rubocop_todo/graphql/unnecessary_field_alias.yml @@ -16,5 +16,4 @@ GraphQL/UnnecessaryFieldAlias: - 'ee/app/graphql/types/dast/profile_type.rb' - 'ee/app/graphql/types/dora/performance_score_connection_type.rb' - 'ee/app/graphql/types/group_release_stats_type.rb' - - 'ee/app/graphql/types/merge_requests/review_llm_summary_type.rb' - 'ee/app/graphql/types/requirements_management/requirement_type.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index e5a4b639f03..f3f9324eeaf 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -3268,7 +3268,6 @@ Layout/LineLength: - 'spec/helpers/timeboxes_helper_spec.rb' - 'spec/helpers/users/callouts_helper_spec.rb' - 'spec/helpers/users_helper_spec.rb' - - 'spec/helpers/visibility_level_helper_spec.rb' - 'spec/helpers/webpack_helper_spec.rb' - 'spec/initializers/6_validations_spec.rb' - 'spec/initializers/direct_upload_support_spec.rb' diff --git a/.rubocop_todo/rails/strong_params.yml b/.rubocop_todo/rails/strong_params.yml index 168d6b01fd6..1cf28bdd514 100644 --- a/.rubocop_todo/rails/strong_params.yml +++ b/.rubocop_todo/rails/strong_params.yml @@ -61,7 +61,6 @@ Rails/StrongParams: - 'app/controllers/concerns/params_backward_compatibility.rb' - 'app/controllers/concerns/preferred_language_switcher.rb' - 'app/controllers/concerns/preview_markdown.rb' - - 'app/controllers/concerns/render_access_tokens.rb' - 'app/controllers/concerns/renders_blob.rb' - 'app/controllers/concerns/requires_allowlisted_monitoring_client.rb' - 'app/controllers/concerns/search_rate_limitable.rb' @@ -69,11 +68,8 @@ Rails/StrongParams: - 'app/controllers/concerns/snippets/blobs_actions.rb' - 'app/controllers/concerns/snippets/send_blob.rb' - 'app/controllers/concerns/snippets_actions.rb' - - 'app/controllers/concerns/snippets_sort.rb' - - 'app/controllers/concerns/sorting_preference.rb' - 'app/controllers/concerns/spammable_actions/captcha_check/html_format_actions_support.rb' - 'app/controllers/concerns/uploads_actions.rb' - - 'app/controllers/concerns/web_hooks/hook_actions.rb' - 'app/controllers/concerns/web_hooks/hook_log_actions.rb' - 'app/controllers/concerns/wiki_actions.rb' - 'app/controllers/dashboard/projects_controller.rb' @@ -114,7 +110,6 @@ Rails/StrongParams: - 'app/controllers/import/fogbugz_controller.rb' - 'app/controllers/import/gitea_controller.rb' - 'app/controllers/import/github_controller.rb' - - 'app/controllers/import/github_groups_controller.rb' - 'app/controllers/import/manifest_controller.rb' - 'app/controllers/import/source_users_controller.rb' - 'app/controllers/invites_controller.rb' @@ -203,7 +198,6 @@ Rails/StrongParams: - 'app/controllers/projects/pipelines/tests_controller.rb' - 'app/controllers/projects/pipelines_controller.rb' - 'app/controllers/projects/pipelines_settings_controller.rb' - - 'app/controllers/projects/project_members_controller.rb' - 'app/controllers/projects/protected_branches_controller.rb' - 'app/controllers/projects/protected_refs_controller.rb' - 'app/controllers/projects/protected_tags_controller.rb' @@ -221,7 +215,6 @@ Rails/StrongParams: - 'app/controllers/projects/settings/ci_cd_controller.rb' - 'app/controllers/projects/settings/integration_hook_logs_controller.rb' - 'app/controllers/projects/settings/integrations_controller.rb' - - 'app/controllers/projects/settings/repository_controller.rb' - 'app/controllers/projects/settings/slacks_controller.rb' - 'app/controllers/projects/snippets_controller.rb' - 'app/controllers/projects/starrers_controller.rb' @@ -250,7 +243,6 @@ Rails/StrongParams: - 'app/controllers/user_settings/identities_controller.rb' - 'app/controllers/user_settings/personal_access_tokens_controller.rb' - 'app/controllers/user_settings/ssh_keys_controller.rb' - - 'app/controllers/user_settings/user_settings_controller.rb' - 'app/controllers/users/namespace_visits_controller.rb' - 'app/controllers/users/pins_controller.rb' - 'app/controllers/users/terms_controller.rb' @@ -259,7 +251,6 @@ Rails/StrongParams: - 'app/controllers/web_ide/remote_ide_controller.rb' - 'ee/app/controllers/admin/ai/feature_settings_controller.rb' - 'ee/app/controllers/admin/ai/self_hosted_models_controller.rb' - - 'ee/app/controllers/admin/audit_logs_controller.rb' - 'ee/app/controllers/admin/elasticsearch_controller.rb' - 'ee/app/controllers/admin/emails_controller.rb' - 'ee/app/controllers/admin/geo/application_controller.rb' @@ -280,13 +271,11 @@ Rails/StrongParams: - 'ee/app/controllers/country_states_controller.rb' - 'ee/app/controllers/ee/admin/application_settings_controller.rb' - 'ee/app/controllers/ee/admin/dev_ops_report_controller.rb' - - 'ee/app/controllers/ee/admin/users_controller.rb' - 'ee/app/controllers/ee/autocomplete_controller.rb' - 'ee/app/controllers/ee/dashboard/projects_controller.rb' - 'ee/app/controllers/ee/groups/autocomplete_sources_controller.rb' - 'ee/app/controllers/ee/groups/group_members_controller.rb' - 'ee/app/controllers/ee/groups/milestones_controller.rb' - - 'ee/app/controllers/ee/groups/settings/repository_controller.rb' - 'ee/app/controllers/ee/groups/work_items_controller.rb' - 'ee/app/controllers/ee/groups_controller.rb' - 'ee/app/controllers/ee/import/github_controller.rb' @@ -297,22 +286,18 @@ Rails/StrongParams: - 'ee/app/controllers/ee/projects/merge_requests_controller.rb' - 'ee/app/controllers/ee/projects/mirrors_controller.rb' - 'ee/app/controllers/ee/projects/project_members_controller.rb' - - 'ee/app/controllers/ee/projects/settings/merge_requests_controller.rb' - - 'ee/app/controllers/ee/projects/settings/repository_controller.rb' - 'ee/app/controllers/ee/projects_controller.rb' - 'ee/app/controllers/ee/registrations_controller.rb' - 'ee/app/controllers/ee/repositories/git_http_client_controller.rb' - 'ee/app/controllers/ee/repositories/git_http_controller.rb' - 'ee/app/controllers/ee/sessions_controller.rb' - 'ee/app/controllers/ee/users_controller.rb' - - 'ee/app/controllers/explore/dependencies_controller.rb' - 'ee/app/controllers/groups/analytics/application_controller.rb' - 'ee/app/controllers/groups/analytics/ci_cd_analytics_controller.rb' - 'ee/app/controllers/groups/analytics/coverage_reports_controller.rb' - 'ee/app/controllers/groups/analytics/cycle_analytics_controller.rb' - 'ee/app/controllers/groups/analytics/productivity_analytics_controller.rb' - 'ee/app/controllers/groups/analytics/tasks_by_type_controller.rb' - - 'ee/app/controllers/groups/audit_events_controller.rb' - 'ee/app/controllers/groups/contribution_analytics_controller.rb' - 'ee/app/controllers/groups/dependencies_controller.rb' - 'ee/app/controllers/groups/epic_boards_controller.rb' @@ -343,7 +328,6 @@ Rails/StrongParams: - 'ee/app/controllers/projects/analytics/issues_analytics_controller.rb' - 'ee/app/controllers/projects/approver_groups_controller.rb' - 'ee/app/controllers/projects/approvers_controller.rb' - - 'ee/app/controllers/projects/audit_events_controller.rb' - 'ee/app/controllers/projects/dependencies_controller.rb' - 'ee/app/controllers/projects/feature_flag_issues_controller.rb' - 'ee/app/controllers/projects/integrations/jira/issues_controller.rb' @@ -366,7 +350,6 @@ Rails/StrongParams: - 'ee/app/controllers/registrations/company_controller.rb' - 'ee/app/controllers/registrations/groups_controller.rb' - 'ee/app/controllers/registrations/welcome_controller.rb' - - 'ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb' - 'ee/app/controllers/security/application_controller.rb' - 'ee/app/controllers/security/projects_controller.rb' - 'ee/app/controllers/smartcard_controller.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index 7819e81f082..937069edc6b 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -1383,7 +1383,6 @@ RSpec/ContextWording: - 'spec/helpers/todos_helper_spec.rb' - 'spec/helpers/tree_helper_spec.rb' - 'spec/helpers/users_helper_spec.rb' - - 'spec/helpers/visibility_level_helper_spec.rb' - 'spec/helpers/web_hooks/web_hooks_helper_spec.rb' - 'spec/helpers/whats_new_helper_spec.rb' - 'spec/initializers/1_acts_as_taggable_spec.rb' diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml index 0fa0d7cb067..dd203c10e8f 100644 --- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml +++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml @@ -313,7 +313,6 @@ RSpec/FactoryBot/AvoidCreate: - 'spec/helpers/users/group_callouts_helper_spec.rb' - 'spec/helpers/users_helper_spec.rb' - 'spec/helpers/version_check_helper_spec.rb' - - 'spec/helpers/visibility_level_helper_spec.rb' - 'spec/helpers/web_hooks/web_hooks_helper_spec.rb' - 'spec/helpers/whats_new_helper_spec.rb' - 'spec/helpers/wiki_helper_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index 7ad96aec4a8..ba650163e2e 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -443,13 +443,10 @@ RSpec/NamedSubject: - 'ee/spec/lib/gitlab/llm/templates/fill_in_merge_request_template_spec.rb' - 'ee/spec/lib/gitlab/llm/templates/generate_commit_message_spec.rb' - 'ee/spec/lib/gitlab/llm/templates/summarize_review_spec.rb' - - 'ee/spec/lib/gitlab/llm/templates/summarize_submitted_review_spec.rb' - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/analyze_ci_job_failure_spec.rb' - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/fill_in_merge_request_template_spec.rb' - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/generate_commit_message_spec.rb' - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/summarize_review_spec.rb' - - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/summarize_submitted_review_spec.rb' - - 'ee/spec/lib/gitlab/llm/vertex_ai/model_configurations/base_spec.rb' - 'ee/spec/lib/gitlab/llm/vertex_ai/model_configurations/chat_spec.rb' - 'ee/spec/lib/gitlab/llm/vertex_ai/model_configurations/code_chat_spec.rb' - 'ee/spec/lib/gitlab/llm/vertex_ai/model_configurations/code_completion_spec.rb' diff --git a/.rubocop_todo/rspec/return_from_stub.yml b/.rubocop_todo/rspec/return_from_stub.yml index ec4747cb462..4740f20ba9b 100644 --- a/.rubocop_todo/rspec/return_from_stub.yml +++ b/.rubocop_todo/rspec/return_from_stub.yml @@ -93,7 +93,6 @@ RSpec/ReturnFromStub: - 'spec/helpers/projects_helper_spec.rb' - 'spec/helpers/users/callouts_helper_spec.rb' - 'spec/helpers/users_helper_spec.rb' - - 'spec/helpers/visibility_level_helper_spec.rb' - 'spec/lib/banzai/filter/issuable_reference_expansion_filter_spec.rb' - 'spec/lib/banzai/filter/references/external_issue_reference_filter_spec.rb' - 'spec/lib/banzai/reference_parser/issue_parser_spec.rb' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index 67319afe67b..5c844892418 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -1392,7 +1392,6 @@ Style/InlineDisableAnnotation: - 'ee/app/models/search/namespace_index_assignment.rb' - 'ee/app/models/security/training.rb' - 'ee/app/models/vulnerabilities/finding.rb' - - 'ee/app/policies/merge_request/review_llm_summary_policy.rb' - 'ee/app/policies/merge_request_diff_policy.rb' - 'ee/app/policies/path_lock_policy.rb' - 'ee/app/replicators/geo/container_repository_replicator.rb' @@ -1790,7 +1789,6 @@ Style/InlineDisableAnnotation: - 'ee/lib/gitlab/llm/chain/tools/summarize_comments/executor.rb' - 'ee/lib/gitlab/llm/chat_storage.rb' - 'ee/lib/gitlab/llm/templates/explain_vulnerability.rb' - - 'ee/lib/gitlab/llm/vertex_ai/completions/summarize_submitted_review.rb' - 'ee/lib/gitlab/middleware/ip_restrictor.rb' - 'ee/lib/gitlab/path_locks_finder.rb' - 'ee/lib/gitlab/root_excess_size_error_message.rb' diff --git a/CHANGELOG.md b/CHANGELOG.md index 779c7acc210..b3bc7ce8815 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2660,6 +2660,16 @@ entry. - [Finalize the backfill migration for onboarding status step url](gitlab-org/gitlab@f986c1b1cf00968ff106136893bfe68d47895c69) ([merge request](gitlab-org/gitlab!147278)) - [Remove ClusterRepositoryCache migration helper class](gitlab-org/gitlab@f71a7a94ce8d70d9d378ebc225b802b58f0ae006) ([merge request](gitlab-org/gitlab!147244)) +## 16.10.8 (2024-06-25) + +### Fixed (1 change) + +- [Update an expired test certificate](gitlab-org/gitlab@adb50cc178e81e75b78f6b10cafc79cd6be9a43c) ([merge request](gitlab-org/gitlab!156394)) + +### Changed (1 change) + +- [Add a banner informing about token expiration](gitlab-org/gitlab@7f51cdccdd702a4f92607d52b6d4e3884c8e5234) ([merge request](gitlab-org/gitlab!155266)) + ## 16.10.7 (2024-06-11) ### Security (4 changes) @@ -3440,6 +3450,16 @@ No changes. - [Add sharding keys for system_access](gitlab-org/gitlab@62c2fd4788e62e46f1469e2f18d178840e8e3df2) ([merge request](gitlab-org/gitlab!142501)) - [Add sharding keys for purchase](gitlab-org/gitlab@9c3843da74714c72483c17489d5d3d68ceffd2c8) ([merge request](gitlab-org/gitlab!142505)) +## 16.9.9 (2024-06-25) + +### Fixed (1 change) + +- [Update an expired test certificate](gitlab-org/gitlab@8fb9c678564e11392eab4d2001e60f751d6a86bc) ([merge request](gitlab-org/gitlab!156395)) + +### Changed (1 change) + +- [Add a banner informing about token expiration](gitlab-org/gitlab@a079122ed2976df0f023ef55cef4a1585e31b5ce) ([merge request](gitlab-org/gitlab!155267)) + ## 16.9.8 (2024-05-09) No changes. @@ -4270,6 +4290,16 @@ No changes. - [Add remediation badge to vulnerability report](gitlab-org/gitlab@e6236197509eae1bb27edf8fb2c63ccf769c2642) ([merge request](gitlab-org/gitlab!142455)) +## 16.8.8 (2024-06-25) + +### Fixed (1 change) + +- [Update an expired test certificate](gitlab-org/gitlab@5b316194aee0927d3aeb6812f116d30bec8d6e37) ([merge request](gitlab-org/gitlab!156396)) + +### Changed (1 change) + +- [Add a banner informing about token expiration](gitlab-org/gitlab@48caa37b7717dfabfdab4af472ba51de1303ae74) ([merge request](gitlab-org/gitlab!155268)) + ## 16.8.7 (2024-04-12) No changes. diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index ffee22f3696..6e8d6d0a31f 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -c3e5dc8bf1d451e09e0e207358bd5df346ccf6df +029ddfe54a04b857af8fac47f3d7fc2f13705711 diff --git a/app/assets/javascripts/gitlab_pages/components/deployment.vue b/app/assets/javascripts/gitlab_pages/components/deployment.vue index 365bb874702..a2094b292ca 100644 --- a/app/assets/javascripts/gitlab_pages/components/deployment.vue +++ b/app/assets/javascripts/gitlab_pages/components/deployment.vue @@ -1,9 +1,315 @@ + + diff --git a/app/assets/javascripts/gitlab_pages/components/deployments.vue b/app/assets/javascripts/gitlab_pages/components/deployments.vue index d709d7ef2fc..da04d71412b 100644 --- a/app/assets/javascripts/gitlab_pages/components/deployments.vue +++ b/app/assets/javascripts/gitlab_pages/components/deployments.vue @@ -21,7 +21,7 @@ export default { data() { return { showInactive: false, - requestBatchSize: 2, + requestBatchSize: 10, hasError: false, alerts: {}, primaryDeployments: null, diff --git a/app/assets/javascripts/gitlab_pages/queries/delete_pages_deployment.mutation.graphql b/app/assets/javascripts/gitlab_pages/queries/delete_pages_deployment.mutation.graphql new file mode 100644 index 00000000000..fe8513eadd1 --- /dev/null +++ b/app/assets/javascripts/gitlab_pages/queries/delete_pages_deployment.mutation.graphql @@ -0,0 +1,11 @@ +mutation DeletePagesDeployment($deploymentId: PagesDeploymentID!) { + deletePagesDeployment(input: { id: $deploymentId }) { + errors + pagesDeployment { + id + active + deletedAt + updatedAt + } + } +} diff --git a/app/assets/javascripts/gitlab_pages/queries/restore_pages_deployment.mutation.graphql b/app/assets/javascripts/gitlab_pages/queries/restore_pages_deployment.mutation.graphql new file mode 100644 index 00000000000..70516bf2f2a --- /dev/null +++ b/app/assets/javascripts/gitlab_pages/queries/restore_pages_deployment.mutation.graphql @@ -0,0 +1,11 @@ +mutation RestorePagesDeployment($deploymentId: PagesDeploymentID!) { + restorePagesDeployment(input: { id: $deploymentId }) { + errors + pagesDeployment { + id + active + deletedAt + updatedAt + } + } +} diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue index 221370bbcbf..85da51b4e6e 100644 --- a/app/assets/javascripts/issues/list/components/issues_list_app.vue +++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue @@ -1013,6 +1013,8 @@ export default { :toggle-text="$options.i18n.actionsLabel" text-sr-only data-testid="issues-list-more-actions-dropdown" + toggle-class="!gl-m-0 gl-h-full" + class="!gl-w-7" >