From 191fe0b17861470e51c4afc7bd2fce83bdb97a04 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 3 Jul 2025 21:10:23 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/CODEOWNERS | 34 +- .gitlab/ci/docs.gitlab-ci.yml | 1 - .gitlab/ci/rules.gitlab-ci.yml | 1 + .../components/blob_content_viewer.vue | 3 +- .../components/work_item_award_emoji.vue | 11 +- .../components/work_item_detail.vue | 1 + .../work_items/components/work_item_notes.vue | 10 +- .../concerns/integrations/params.rb | 2 - app/models/integrations/prometheus.rb | 57 ---- app/models/namespace.rb | 1 + .../namespaces/traversal/traversable.rb | 22 ++ .../jira_connect/sync_branch_worker.rb | 1 + ...ix_secret_tokens_for_http_destinations.yml | 8 + ...fix_secret_tokens_for_http_destinations.rb | 25 ++ ...path_index_to_ai_code_suggestion_events.rb | 24 ++ db/schema_migrations/20250625222131 | 1 + db/schema_migrations/20250630155204 | 1 + db/structure.sql | 2 + .../.markdownlint/.markdownlint-cli2.yaml | 35 ++ .../ja-jp/administration/gitaly/_index.md | 15 +- .../ja-jp/api/graphql/reference/_index.md | 154 ++++----- .../ja-jp/ci/cloud_deployment/_index.md | 8 +- doc-locale/ja-jp/ci/debugging.md | 2 +- .../ja-jp/ci/secrets/hashicorp_vault.md | 2 +- doc-locale/ja-jp/ci/yaml/_index.md | 4 +- doc-locale/ja-jp/install/aws/_index.md | 4 +- doc-locale/ja-jp/install/installation.md | 2 +- doc-locale/ja-jp/operations/feature_flags.md | 4 +- .../tutorials/make_first_git_commit/_index.md | 2 +- doc-locale/ja-jp/update/deprecations.md | 10 +- doc-locale/ja-jp/update/package/_index.md | 2 +- .../update/versions/gitlab_16_changes.md | 30 +- .../ja-jp/user/application_security/_index.md | 2 +- .../container_scanning/_index.md | 2 +- .../dependency_scanning/_index.md | 4 +- .../application_security/policies/_index.md | 4 +- .../policies/pipeline_execution_policies.md | 2 +- .../user/application_security/sast/_index.md | 2 +- .../user/clusters/agent/ci_cd_workflow.md | 2 +- doc-locale/ja-jp/user/custom_roles/_index.md | 2 +- doc-locale/ja-jp/user/group/_index.md | 2 +- .../ja-jp/user/group/saml_sso/_index.md | 34 +- .../group/settings/group_access_tokens.md | 2 +- doc-locale/ja-jp/user/markdown.md | 69 ++-- .../user/packages/package_registry/_index.md | 22 +- .../ja-jp/user/profile/notifications.md | 72 ++-- doc-locale/ja-jp/user/project/issue_board.md | 12 +- doc-locale/ja-jp/user/project/labels.md | 2 +- .../members/sharing_projects_groups.md | 2 +- .../project/merge_requests/approvals/rules.md | 2 +- .../user/project/merge_requests/changes.md | 2 +- .../merge_requests/cherry_pick_changes.md | 44 +-- .../project/merge_requests/reviews/_index.md | 2 +- .../repository/code_suggestions/_index.md | 2 +- .../project/repository/forking_workflow.md | 2 +- .../ja-jp/user/search/advanced_search.md | 8 +- doc-locale/ja-jp/user/workspace/_index.md | 4 +- doc/user/analytics/ai_impact_analytics.md | 6 +- .../api_fuzzing/_index.md | 157 ++++++++- .../api_fuzzing/configuration/_index.md | 2 +- .../api_fuzzing/configuration/requirements.md | 117 +------ lib/api/merge_requests.rb | 20 +- ...fix_secret_tokens_for_http_destinations.rb | 14 + lib/tasks/gitlab/tw/codeowners.rake | 2 +- locale/gitlab.pot | 35 +- qa/Rakefile | 65 ---- qa/qa/tools/test_resources_handler.rb | 11 +- qa/tasks/resource_cleanup.rake | 66 ++++ scripts/i18n_lint_doc.sh | 10 +- spec/factories/integrations.rb | 2 - .../issues/user_interacts_with_awards_spec.rb | 316 +++++------------- .../issues/user_uploads_file_to_note_spec.rb | 18 +- ...ith_external_authorization_enabled_spec.rb | 3 +- .../issues/viewing_relocated_issues_spec.rb | 4 + .../components/work_item_award_emoji_spec.js | 29 +- .../components/work_item_notes_spec.js | 19 ++ ...ecret_tokens_for_http_destinations_spec.rb | 26 ++ spec/models/integrations/prometheus_spec.rb | 119 +------ .../operations/update_service_spec.rb | 6 +- spec/support/rspec_order_todo.yml | 3 +- .../namespaces/traversal_scope_examples.rb | 81 +++++ 81 files changed, 942 insertions(+), 971 deletions(-) create mode 100644 app/models/namespaces/traversal/traversable.rb create mode 100644 db/docs/batched_background_migrations/fix_secret_tokens_for_http_destinations.yml create mode 100644 db/post_migrate/20250625222131_queue_fix_secret_tokens_for_http_destinations.rb create mode 100644 db/post_migrate/20250630155204_add_namespace_path_index_to_ai_code_suggestion_events.rb create mode 100644 db/schema_migrations/20250625222131 create mode 100644 db/schema_migrations/20250630155204 create mode 100644 doc-locale/.markdownlint/.markdownlint-cli2.yaml create mode 100644 lib/gitlab/background_migration/fix_secret_tokens_for_http_destinations.rb create mode 100644 qa/tasks/resource_cleanup.rake create mode 100644 spec/migrations/20250625222131_queue_fix_secret_tokens_for_http_destinations_spec.rb diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index ed7e7f33bf9..0108366cc32 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -43,6 +43,7 @@ /doc-locale/ @gitlab-com/localization/maintainers /doc/development/i18n/proofreader.md @gitlab-com/localization/maintainers /argo_translation.yml @gitlab-com/localization/maintainers +/doc-locale/.markdownlint/ @gitlab-com/localization/maintainers config/bounded_contexts.yml @fabiopitino @grzesiek @stanhu @cwoolley-gitlab @tkuah @@ -594,7 +595,7 @@ lib/gitlab/checks/ /doc/administration/auth/ @idurham /doc/administration/auth/ldap/ldap_synchronization.md @lciutacu /doc/administration/backup_restore/ @axil -/doc/administration/broadcast_messages.md @sselhorn +/doc/administration/broadcast_messages.md @kpaizee /doc/administration/cells.md @emily.sahlani /doc/administration/cicd/ @lyspin /doc/administration/cicd/job_logs.md @rsarangadharan @@ -734,6 +735,7 @@ lib/gitlab/checks/ /doc/api/chat.md @jglassman1 /doc/api/code_suggestions.md @jglassman1 /doc/api/commits.md @brendan777 +/doc/api/compliance_policy_settings.md @rlehmann1 /doc/api/container_registry.md @z_painter /doc/api/container_repository_protection_rules.md @z_painter /doc/api/custom_attributes.md @msedlakjakubowski @@ -776,7 +778,7 @@ lib/gitlab/checks/ /doc/api/group_integrations.md @ashrafkhamis /doc/api/group_iterations.md @msedlakjakubowski /doc/api/group_labels.md @msedlakjakubowski -/doc/api/group_ldap_links.md @phillipwells +/doc/api/group_ldap_links.md @lciutacu /doc/api/group_level_variables.md @marcel.amirault /doc/api/group_markdown_uploads.md @msedlakjakubowski /doc/api/group_milestones.md @msedlakjakubowski @@ -816,7 +818,7 @@ lib/gitlab/checks/ /doc/api/milestones.md @msedlakjakubowski /doc/api/namespaces.md @phillipwells /doc/api/notes.md @msedlakjakubowski -/doc/api/notification_settings.md @sselhorn +/doc/api/notification_settings.md @kpaizee /doc/api/oauth2.md @idurham /doc/api/openapi/ @ashrafkhamis /doc/api/organizations.md @phillipwells @@ -829,7 +831,6 @@ lib/gitlab/checks/ /doc/api/pipeline_triggers.md @lyspin /doc/api/pipelines.md @lyspin /doc/api/plan_limits.md @idurham -/doc/api/policy_settings.md @rlehmann1 /doc/api/project_access_tokens.md @idurham /doc/api/project_aliases.md @brendan777 /doc/api/project_badges.md @phillipwells @@ -866,7 +867,7 @@ lib/gitlab/checks/ /doc/api/rest/ @ashrafkhamis /doc/api/runners.md @rsarangadharan /doc/api/saml.md @idurham -/doc/api/scim.md @idurham +/doc/api/scim.md @lciutacu /doc/api/search.md @ashrafkhamis /doc/api/search_admin.md @ashrafkhamis /doc/api/secure_files.md @marcel.amirault @@ -883,7 +884,7 @@ lib/gitlab/checks/ /doc/api/templates/gitignores.md @brendan777 /doc/api/templates/gitlab_ci_ymls.md @marcel.amirault /doc/api/templates/licenses.md @rdickenson -/doc/api/todos.md @sselhorn +/doc/api/todos.md @kpaizee /doc/api/topics.md @phillipwells /doc/api/user_email_addresses.md @idurham /doc/api/user_follow_unfollow.md @idurham @@ -989,7 +990,6 @@ lib/gitlab/checks/ /doc/development/spam_protection_and_captcha/ @gitlab-org/software-supply-chain-security/authorization/approvers /doc/development/stage_group_observability/ @gitlab-org/analytics-section/product-analytics/engineers/frontend /doc/development/tracing.md @gitlab-org/analytics-section/product-analytics/engineers/frontend -/doc/downgrade_ee_to_ce/ @axil @eread /doc/drawers/ @ashrafkhamis /doc/editor_extensions/ @aqualls /doc/install/ @axil @eread @@ -1042,9 +1042,10 @@ lib/gitlab/checks/ /doc/tutorials/issue_triage_complex_group/ @msedlakjakubowski /doc/tutorials/issue_triage_group/ @msedlakjakubowski /doc/tutorials/kanban/ @msedlakjakubowski -/doc/tutorials/left_sidebar/ @sselhorn +/doc/tutorials/left_sidebar/ @kpaizee /doc/tutorials/merge_requests/ @aqualls /doc/tutorials/move_personal_project_to_group/ @phillipwells +/doc/tutorials/pipeline_execution_policy/ @rlehmann1 /doc/tutorials/protected_workflow/ @aqualls /doc/tutorials/reviews/ @aqualls /doc/tutorials/scan_execution_policy/ @rlehmann1 @@ -1110,8 +1111,12 @@ lib/gitlab/checks/ /doc/user/group/reporting/ @idurham /doc/user/group/repositories_analytics/ @lyspin /doc/user/group/roadmap/ @msedlakjakubowski -/doc/user/group/saml_sso/ @idurham +/doc/user/group/saml_sso/_index.md @idurham +/doc/user/group/saml_sso/example_saml_config.md @idurham /doc/user/group/saml_sso/group_sync.md @lciutacu +/doc/user/group/saml_sso/scim_setup.md @lciutacu +/doc/user/group/saml_sso/troubleshooting.md @idurham +/doc/user/group/saml_sso/troubleshooting_scim.md @lciutacu /doc/user/group/settings/ @idurham /doc/user/group/ssh_certificates.md @brendan777 /doc/user/group/subgroups/ @phillipwells @@ -1127,7 +1132,7 @@ lib/gitlab/checks/ /doc/user/profile/ @idurham /doc/user/profile/account/create_accounts.md @lciutacu /doc/user/profile/comment_templates.md @aqualls -/doc/user/profile/notifications.md @sselhorn +/doc/user/profile/notifications.md @kpaizee /doc/user/project/_index.md @phillipwells /doc/user/project/autocomplete_characters.md @brendan777 /doc/user/project/badges.md @phillipwells @@ -1159,7 +1164,7 @@ lib/gitlab/checks/ /doc/user/project/integrations/hangouts_chat.md @ashrafkhamis /doc/user/project/integrations/harbor.md @z_painter /doc/user/project/integrations/irker.md @ashrafkhamis -/doc/user/project/integrations/matrix.md @sselhorn +/doc/user/project/integrations/matrix.md @kpaizee /doc/user/project/integrations/mattermost.md @ashrafkhamis /doc/user/project/integrations/mattermost_slash_commands.md @ashrafkhamis /doc/user/project/integrations/microsoft_teams.md @ashrafkhamis @@ -1209,7 +1214,6 @@ lib/gitlab/checks/ /doc/user/project/settings/_index.md @phillipwells /doc/user/project/settings/import_export.md @ashrafkhamis /doc/user/project/settings/import_export_troubleshooting.md @ashrafkhamis -/doc/user/project/settings/migrate_projects.md @phillipwells /doc/user/project/settings/project_access_tokens.md @idurham /doc/user/project/system_notes.md @brendan777 /doc/user/project/time_tracking.md @msedlakjakubowski @@ -1223,15 +1227,15 @@ lib/gitlab/checks/ /doc/user/reserved_names.md @phillipwells /doc/user/rich_text_editor.md @msedlakjakubowski /doc/user/search/ @ashrafkhamis -/doc/user/search/command_palette.md @sselhorn -/doc/user/shortcuts.md @sselhorn +/doc/user/search/command_palette.md @kpaizee +/doc/user/shortcuts.md @kpaizee /doc/user/snippets.md @brendan777 /doc/user/ssh.md @idurham /doc/user/ssh_troubleshooting.md @idurham /doc/user/storage_management_automation.md @lciutacu /doc/user/storage_usage_quotas.md @lciutacu /doc/user/tasks.md @msedlakjakubowski -/doc/user/todos.md @sselhorn +/doc/user/todos.md @kpaizee /doc/user/work_items/ @msedlakjakubowski /doc/user/workspace/ @brendan777 # End rake-managed-docs-block diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 4060ccd9c48..a8c73344e49 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -189,7 +189,6 @@ docs-i18n-lint markdown: stage: lint needs: [] script: - - 'echo " link-fragments: false" >> .markdownlint-cli2.yaml' - source ./scripts/utils.sh - | function docs_i18n_lint_markdown() { diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 176e2b1c77f..5ac339bdce0 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -335,6 +335,7 @@ .docs-i18n-patterns: &docs-i18n-patterns - "doc-locale/**/*" + - "doc-locale/.markdownlint/.markdownlint-cli2.yaml" - "scripts/i18n_lint_doc.sh" - "scripts/i18n_verify_paths.sh" diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index 1f61091a757..867d7900be4 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -1,6 +1,7 @@