From a4356e2ca0f3a3a7bdc4ff5dbc589fb4b7dc9d01 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 1 Feb 2024 03:07:49 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../admin/statistics_panel/components/app.vue | 2 +- .../components/custom_metrics_form.vue | 2 +- .../components/delete_custom_metric_modal.vue | 2 +- .../components/environment_actions.vue | 2 +- .../ide/components/commit_sidebar/form.vue | 4 ++-- .../ide/components/file_row_extra.vue | 2 +- .../components/assignees/assignee_title.vue | 2 +- .../labels_select_vue/dropdown_button.vue | 2 +- .../dropdown_contents_create_view.vue | 5 ++++- .../labels_select_vue/dropdown_title.vue | 2 +- .../components/reviewers/reviewer_title.vue | 2 +- .../reviewers/uncollapsed_reviewer_list.vue | 8 ++++---- .../sidebar/components/todo_toggle/todo.vue | 2 +- app/assets/stylesheets/pages/note_form.scss | 2 +- app/helpers/dashboard_helper.rb | 2 +- .../appearances/_form.html.haml | 2 +- app/views/admin/dashboard/index.html.haml | 20 +++++++++---------- app/views/admin/groups/show.html.haml | 4 ++-- app/views/admin/runners/edit.html.haml | 2 +- app/views/admin/users/projects.html.haml | 4 ++-- app/views/admin/users/show.html.haml | 4 ++-- .../profiles/chat_names/_chat_name.html.haml | 2 +- .../profiles/two_factor_auths/show.html.haml | 2 +- .../projects/commits/_inline_commit.html.haml | 2 +- app/views/projects/hook_logs/show.html.haml | 4 ++-- .../issues/service_desk/_issue.html.haml | 2 +- .../projects/mattermosts/_no_teams.html.haml | 2 +- .../mattermosts/_team_selection.html.haml | 2 +- .../merge_requests/_merge_request.html.haml | 2 +- .../merge_requests/_mr_title.html.haml | 2 +- app/views/projects/no_repo.html.haml | 2 +- .../search/results/_snippet_title.html.haml | 4 ++-- .../issuable/_bulk_update_sidebar.html.haml | 2 +- .../issuable/_label_page_create.html.haml | 2 +- app/views/shared/issuable/_sidebar.html.haml | 2 +- .../shared/milestones/_labels_tab.html.haml | 2 +- .../shared/milestones/_sidebar.html.haml | 8 ++++---- app/views/shared/snippets/_snippet.html.haml | 2 +- .../shared/wikis/_pages_wiki_page.html.haml | 2 +- app/views/shared/wikis/_sidebar.html.haml | 2 +- .../active_sessions/_active_session.html.haml | 2 +- .../user_settings/_event_table.haml | 2 +- doc/development/code_review.md | 2 +- doc/development/code_suggestions/index.md | 2 +- .../site_architecture/automation.md | 4 ++-- .../documentation/styleguide/word_list.md | 4 ++-- doc/development/feature_flags/controls.md | 4 ++-- .../secure_partner_integration.md | 2 +- doc/development/internal_analytics/index.md | 4 ++-- .../event_definition_guide.md | 4 ++-- .../metrics/metrics_dictionary.md | 4 ++-- .../internal_analytics/service_ping/index.md | 6 +++--- doc/development/labels/index.md | 2 +- doc/development/pipelines/index.md | 4 ++-- doc/development/pipelines/internals.md | 2 +- .../product_qualified_lead_guide/index.md | 2 +- .../dashboards/index.md | 2 +- ...unning_tests_that_require_special_setup.md | 2 +- doc/install/requirements.md | 2 +- .../advanced_search/elasticsearch.md | 2 +- doc/security/email_verification.md | 2 +- doc/security/unlock_user.md | 2 +- doc/subscriptions/community_programs.md | 6 +++--- doc/update/index.md | 2 +- doc/update/terminology.md | 2 +- doc/update/versions/gitlab_14_changes.md | 6 +++--- doc/user/ai_features.md | 4 ++-- .../api_fuzzing/configuration/index.md | 2 +- .../configuration/overriding_analyzer_jobs.md | 2 +- .../api_fuzzing/configuration/requirements.md | 2 +- .../dast_api/configuration/index.md | 2 +- .../configuration/overriding_analyzer_jobs.md | 2 +- .../dast_api/configuration/requirements.md | 2 +- .../application_security/policies/index.md | 1 + doc/user/group/epics/manage_epics.md | 2 +- .../group/saml_sso/troubleshooting_scim.md | 2 +- doc/user/profile/index.md | 2 +- .../repository/code_suggestions/index.md | 2 +- .../__snapshots__/todo_spec.js.snap | 2 +- .../components/todo_toggle/todo_spec.js | 2 +- 80 files changed, 118 insertions(+), 114 deletions(-) diff --git a/app/assets/javascripts/admin/statistics_panel/components/app.vue b/app/assets/javascripts/admin/statistics_panel/components/app.vue index 5e7b7e959e0..47ec4af373c 100644 --- a/app/assets/javascripts/admin/statistics_panel/components/app.vue +++ b/app/assets/javascripts/admin/statistics_panel/components/app.vue @@ -39,7 +39,7 @@ export default { class="js-stats" > {{ statistic.label }} - {{ statistic.value }} + {{ statistic.value }}

diff --git a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue index 78d0a9da79a..f8cd47dad7b 100644 --- a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue +++ b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue @@ -79,7 +79,7 @@ export default { {{ saveButtonText }} - {{ __('Cancel') }} + {{ __('Cancel') }}