From 9004962faa8eb43b3debffcb15290febe3158beb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 24 Jun 2025 09:11:56 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .eslint_todo/vue-no-unused-properties.mjs | 1 - .gitlab/ci/docs.gitlab-ci.yml | 24 +- .gitlab/ci/rules.gitlab-ci.yml | 3 +- GITLAB_KAS_VERSION | 2 +- .../javascripts/ai/catalog/ai_catalog_app.vue | 2 +- .../components/ai_catalog_nav_tabs.vue | 2 +- ...root_cause_analysis_hotspot_experiment.vue | 4 - .../javascripts/ci/job_details/job_app.vue | 8 +- .../failure_widget/failed_job_details.vue | 6 +- app/graphql/mutations/timelogs/create.rb | 2 + app/models/namespace_setting.rb | 8 +- app/models/pages/lookup_path.rb | 6 + .../issuable/callbacks/time_tracking.rb | 7 + app/views/explore/ai_catalog/index.html.haml | 2 +- config/audit_events/types/type_schema.json | 7 + ...ce_default_role_for_pipeline_variables.yml | 8 - ..._projects_redirect_routes_namespace_id.yml | 2 +- ...l_projects_redirect_routes_namespace_id.rb | 20 + db/schema_migrations/20250618220241 | 1 + doc-locale/ja-jp/ci/jobs/mobile_devops.md | 14 - .../dedicated/hosted_runners.md | 4 +- doc/api/graphql/reference/_index.md | 12 + .../repository/code_suggestions/_index.md | 6 +- .../entities/internal/pages/lookup_path.rb | 3 +- lib/gitlab/audit/type/definition.rb | 3 +- lib/gitlab/audit/type/shared.rb | 1 + lib/sidebars/explore/menus/ai_catalog_menu.rb | 2 +- locale/gitlab.pot | 30 +- .../example_runtimes/master_report.json | 972 +++++++++--------- qa/knapsack/master_report.json | 548 +++++----- .../{lint-i18n-doc.sh => i18n_lint_doc.sh} | 0 scripts/i18n_verify_paths.sh | 48 + .../schemas/internal/pages/lookup_path.json | 5 + spec/lib/gitlab/audit/type/definition_spec.rb | 2 +- spec/models/namespace_setting_spec.rb | 8 +- spec/models/pages/lookup_path_spec.rb | 15 +- spec/models/project_ci_cd_setting_spec.rb | 16 +- .../ci/namespace_settings_update_spec.rb | 14 +- spec/requests/api/internal/pages_spec.rb | 15 +- .../issuable/callbacks/time_tracking_spec.rb | 8 + .../navbar_structure_context.rb | 2 +- 41 files changed, 985 insertions(+), 858 deletions(-) delete mode 100644 app/assets/javascripts/ci/job_details/components/root_cause_analysis_hotspot_experiment.vue delete mode 100644 config/feature_flags/development/change_namespace_default_role_for_pipeline_variables.yml create mode 100644 db/post_migrate/20250618220241_finalize_backfill_projects_redirect_routes_namespace_id.rb create mode 100644 db/schema_migrations/20250618220241 delete mode 100644 doc-locale/ja-jp/ci/jobs/mobile_devops.md rename scripts/{lint-i18n-doc.sh => i18n_lint_doc.sh} (100%) create mode 100755 scripts/i18n_verify_paths.sh diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs index 52ea4b2c2c3..0e15f9121cb 100644 --- a/.eslint_todo/vue-no-unused-properties.mjs +++ b/.eslint_todo/vue-no-unused-properties.mjs @@ -274,7 +274,6 @@ export default { 'ee/app/assets/javascripts/environments_dashboard/components/dashboard/environment.vue', 'ee/app/assets/javascripts/external_issues_show/components/note.vue', 'ee/app/assets/javascripts/geo_sites/components/header/geo_site_last_updated.vue', - 'ee/app/assets/javascripts/invite_members/components/invite_modal_base.vue', 'ee/app/assets/javascripts/oncall_schedules/components/add_edit_schedule_form.vue', 'ee/app/assets/javascripts/oncall_schedules/components/oncall_schedule.vue', 'ee/app/assets/javascripts/oncall_schedules/components/rotations/components/rotation_assignee.vue', diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 683d49fde34..4060ccd9c48 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -192,9 +192,27 @@ docs-i18n-lint markdown: - 'echo " link-fragments: false" >> .markdownlint-cli2.yaml' - source ./scripts/utils.sh - | - function docs_lint_markdown() { + function docs_i18n_lint_markdown() { install_gitlab_gem - scripts/lint-i18n-doc.sh + scripts/i18n_lint_doc.sh } - run_with_custom_exit_code docs_lint_markdown + run_with_custom_exit_code docs_i18n_lint_markdown + +# Verify localized documentation files have corresponding English versions +docs-i18n-lint paths: + extends: + - .default-retry + - .docs:rules:docs-i18n-lint + - .docs-markdown-lint-image + stage: lint + needs: [] + script: + - source ./scripts/utils.sh + - | + function docs_i18n_verify_paths() { + install_gitlab_gem + scripts/i18n_verify_paths.sh + } + + run_with_custom_exit_code docs_i18n_verify_paths diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 18c44ca2fa1..b889e55eafd 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -335,7 +335,8 @@ .docs-i18n-patterns: &docs-i18n-patterns - "doc-locale/**/*" - - "scripts/lint-i18n-doc.sh" + - "scripts/i18n_lint_doc.sh" + - "scripts/i18n_verify_paths.sh" .if-tech-docs-localization: &if-tech-docs-localization if: '($CI_PROJECT_PATH == "gitlab-com/localization" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 805c4f079ff..7f8042de09e 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -7e5564cdc5834808c2d668ffd5788146defaf881 +a5ee6c94ca31d1c3a84e9a1e6fad88fec35465e3 diff --git a/app/assets/javascripts/ai/catalog/ai_catalog_app.vue b/app/assets/javascripts/ai/catalog/ai_catalog_app.vue index 8ad7cabba4d..9ade4051dd6 100644 --- a/app/assets/javascripts/ai/catalog/ai_catalog_app.vue +++ b/app/assets/javascripts/ai/catalog/ai_catalog_app.vue @@ -13,7 +13,7 @@ export default {