From 92bcd7dce0f4acfb49d16928c07335c8b691dd0a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 24 Jul 2024 21:07:24 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../private/jobs_filtered_search/app.vue | 22 ++++ .../private/jobs_filtered_search/utils.js | 3 + .../graphql/queries/get_jobs.query.graphql | 10 +- .../queries/get_jobs_count.query.graphql | 4 +- .../ci/jobs_page/jobs_page_app.vue | 56 ++++++---- .../components/wrappers/code_block.vue | 6 +- .../kubernetes/delete_pod_modal.vue | 9 +- .../kubernetes/kubernetes_overview.vue | 6 +- .../components/kubernetes/kubernetes_pods.vue | 3 +- .../kubernetes/kubernetes_status_bar.vue | 1 - .../components/workload_details.vue | 24 +++- .../javascripts/lib/utils/url_utility.js | 19 +++- .../members/placeholders/components/app.vue | 34 ++++-- .../components/placeholder_actions.vue | 10 +- .../components/placeholders_table.vue | 6 +- .../components/alert_details_table.vue | 4 +- .../metric_image_details_modal.vue | 4 +- .../components/user_popover/user_popover.vue | 16 +-- .../components/user_select/user_select.vue | 12 +- .../notes/work_item_comment_form.vue | 2 +- .../shared/work_item_token_input.vue | 4 +- .../components/work_item_time_tracking.vue | 1 + .../bootstrap_migration_reset.scss | 2 +- app/controllers/projects/jobs_controller.rb | 5 + app/models/project.rb | 29 +++++ app/services/lfs/lock_file_service.rb | 5 +- app/services/lfs/unlock_file_service.rb | 2 + .../shared/issuable/form/_metadata.html.haml | 2 +- doc/development/secure_coding_guidelines.md | 2 +- .../gitlab_advisory_database/index.md | 2 +- .../clusters/connect/img/variables_civo.png | Bin 22629 -> 83416 bytes .../clusters/connect/new_civo_cluster.md | 39 +++---- .../merge_requests/duo_in_merge_requests.md | 35 ------ doc/user/project/protected_branches.md | 20 ++++ doc/user/project/repository/branches/index.md | 27 ++--- .../templates/Area.metrics-dashboard.yml | 15 --- .../templates/Default.metrics-dashboard.yml | 24 ---- .../templates/gauge.metrics-dashboard.yml | 23 ---- lib/gitlab/metrics/templates/index.md | 3 - .../templates/k8s_area.metrics-dashboard.yml | 15 --- .../templates/k8s_gauge.metrics-dashboard.yml | 23 ---- .../k8s_single-stat.metrics-dashboard.yml | 17 --- .../single-stat.metrics-dashboard.yml | 17 --- locale/gitlab.pot | 14 ++- spec/features/broadcast_messages_spec.rb | 24 ++-- spec/features/issues/gfm_autocomplete_spec.rb | 2 +- ...r_sees_sidebar_updates_in_realtime_spec.rb | 6 +- .../work_items/work_item_children_spec.rb | 4 +- ...bs_filtered_search_spec.js => app_spec.js} | 60 +++++++++- .../jobs_filtered_search/utils_spec.js | 1 + .../ci/jobs_page/job_page_app_spec.js | 104 ++++++++++++++++++ .../kubernetes/kubernetes_overview_spec.js | 10 ++ .../kubernetes/kubernetes_pods_spec.js | 3 +- .../graphql/resolvers/kubernetes_spec.js | 4 +- .../components/workload_details_spec.js | 46 +++++++- .../components/workload_table_spec.js | 2 +- spec/frontend/lib/utils/mock_data.js | 4 +- spec/frontend/lib/utils/url_utility_spec.js | 16 +-- .../placeholders/components/app_spec.js | 70 +++++++++++- .../components/placeholder_actions_spec.js | 32 ++++++ .../components/placeholders_table_spec.js | 14 +++ .../members/placeholders/mock_data.js | 6 + spec/frontend/users_select/test_helper.js | 4 +- spec/models/project_spec.rb | 45 ++++++++ spec/services/lfs/lock_file_service_spec.rb | 34 +++--- spec/services/lfs/unlock_file_service_spec.rb | 28 +++-- .../features/work_items_shared_examples.rb | 57 ++++++---- .../models/project_shared_examples.rb | 24 ++++ 68 files changed, 795 insertions(+), 382 deletions(-) delete mode 100644 lib/gitlab/metrics/templates/Area.metrics-dashboard.yml delete mode 100644 lib/gitlab/metrics/templates/Default.metrics-dashboard.yml delete mode 100644 lib/gitlab/metrics/templates/gauge.metrics-dashboard.yml delete mode 100644 lib/gitlab/metrics/templates/index.md delete mode 100644 lib/gitlab/metrics/templates/k8s_area.metrics-dashboard.yml delete mode 100644 lib/gitlab/metrics/templates/k8s_gauge.metrics-dashboard.yml delete mode 100644 lib/gitlab/metrics/templates/k8s_single-stat.metrics-dashboard.yml delete mode 100644 lib/gitlab/metrics/templates/single-stat.metrics-dashboard.yml rename spec/frontend/ci/common/private/jobs_filtered_search/{jobs_filtered_search_spec.js => app_spec.js} (65%) diff --git a/app/assets/javascripts/ci/common/private/jobs_filtered_search/app.vue b/app/assets/javascripts/ci/common/private/jobs_filtered_search/app.vue index 86ccdb2c87b..a1035c57275 100644 --- a/app/assets/javascripts/ci/common/private/jobs_filtered_search/app.vue +++ b/app/assets/javascripts/ci/common/private/jobs_filtered_search/app.vue @@ -73,6 +73,18 @@ export default { value: { data: queryStringValue, operator: OPERATOR_IS }, }, ]; + case 'name': + if (!this.glFeatures.populateAndUseBuildNamesTable) { + return acc; + } + + return [ + ...acc, + { + type: 'filtered-search-term', + value: { data: queryStringValue }, + }, + ]; default: return acc; } @@ -91,6 +103,16 @@ export default { diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/delete_pod_modal.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/delete_pod_modal.vue index 35a97b120cf..f758eb835f7 100644 --- a/app/assets/javascripts/environments/environment_details/components/kubernetes/delete_pod_modal.vue +++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/delete_pod_modal.vue @@ -76,7 +76,7 @@ export default { 'Environments|Are you sure you want to delete %{podName}? This action cannot be undone.', ), buttonPrimary: s__('Environments|Delete pod'), - buttonCancel: s__('Environments|Cancel'), + buttonCancel: __('Cancel'), success: s__('Environments|Pod deleted successfully'), error: __('Error: '), }, @@ -84,7 +84,12 @@ export default { };