Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab-ci.yml

@@ -249,7 +249,6 @@ variables:
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec/flaky/report-suite.json
   JEST_MATCHING_TEST_FILES_PATH: jest/matching_test_files.txt
   GITLAB_WORKHORSE_FOLDER: "gitlab-workhorse"
-  JOB_METRICS_FILE_PATH: "${CI_PROJECT_DIR}/tmp/job-metrics.json"
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/report-master.json
   RSPEC_FAIL_FAST_THRESHOLD: 20
   RSPEC_FAST_QUARANTINE_PATH: rspec/fast_quarantine-gitlab.txt

.gitlab/ci/rails/shared.gitlab-ci.yml

@@ -27,7 +27,6 @@ include:
     - section_start "gitaly-test-spawn" "Spawning Gitaly"; scripts/gitaly-test-spawn; section_end "gitaly-test-spawn"  # Do not use 'bundle exec' here
     - export RSPEC_SKIPPED_TESTS_REPORT_PATH="rspec/skipped_tests-${CI_JOB_ID}.txt"
     - export RSPEC_RETRIED_TESTS_REPORT_PATH="rspec/retried_tests-${CI_JOB_ID}.txt"
-    - tooling/bin/create_job_metrics_file || true
 
 .no-redis-cluster:
   variables:
@@ -211,7 +210,6 @@ include:
         echoinfo "Not reporting test files close to timing out because \$ALLOW_KNAPSACK_REPORT_CREATE_ISSUES != 'true' or KNAPSACK_REPORT_ISSUES_PROJECT_TOKEN is not set"
       fi
       section_end "knapsack-report-issues"
-    - tooling/bin/push_job_metrics || true
     - scripts/minify-simplecov-resultsets.rb
 
 .base-artifacts:

.gitlab/merge_request_templates/Security Fix.md

@@ -36,15 +36,18 @@ See [the general developer security guidelines](https://gitlab.com/gitlab-org/re
 
 ## AppSec checklist
 
+This checklist is to be completed by the [Application Security & Response Team](https://handbook.gitlab.com/handbook/security/product-security/application-security/)
+
 - [ ] Assign the right [AppSecWeight](https://handbook.gitlab.com/handbook/security/product-security/application-security/milestone-planning/#weight-labels) label
-- [ ] Update the `~AppSecWorkflow::in-progress` to `~AppSecWorkflow::complete` 
+- [ ] Update the `~AppSecWorkflow::new` to `~AppSecWorkflow::in-progress` when you have started to review the MR
+- [ ] Update the `~AppSecWorkflow::in-progress` to `~AppSecWorkflow::complete` when the MR has been reviewed
 
 /label ~security
 
 <!-- AppSec specific labels -->
 
 /label ~"Division::Security" ~"Department::Product Security" ~"Application Security Team"
-/label ~"AppSecWorkflow::in-progress" ~"AppSecWorkType::VulnFixVerification"
+/label ~"AppSecWorkType::VulnFixVerification"
 /label ~"AppSecPriority::1" <!-- This is always a priority to review for us to ensure the fix is good and the release is done on time -->
 
 [CHANGELOG entry]: https://docs.gitlab.com/development/changelog/#overview

.rubocop_todo/rspec/named_subject.yml

@@ -3124,7 +3124,6 @@ RSpec/NamedSubject:
     - 'spec/tooling/lib/tooling/helm3_client_spec.rb'
     - 'spec/tooling/lib/tooling/helpers/file_handler_spec.rb'
     - 'spec/tooling/lib/tooling/helpers/predictive_tests_helper_spec.rb'
-    - 'spec/tooling/lib/tooling/job_metrics_spec.rb'
     - 'spec/tooling/lib/tooling/kubernetes_client_spec.rb'
     - 'spec/tooling/lib/tooling/mappings/graphql_base_type_mappings_spec.rb'
     - 'spec/tooling/lib/tooling/mappings/js_to_system_specs_mappings_spec.rb'

.rubocop_todo/rspec/receive_messages.yml

@@ -506,7 +506,6 @@ RSpec/ReceiveMessages:
     - 'spec/tooling/danger/sidekiq_queues_spec.rb'
     - 'spec/tooling/danger/stable_branch_spec.rb'
     - 'spec/tooling/lib/tooling/helpers/predictive_tests_helper_spec.rb'
-    - 'spec/tooling/lib/tooling/job_metrics_spec.rb'
     - 'spec/views/admin/dashboard/index.html.haml_spec.rb'
     - 'spec/views/admin/groups/_form.html.haml_spec.rb'
     - 'spec/views/admin/sessions/new.html.haml_spec.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -2315,7 +2315,6 @@ Style/InlineDisableAnnotation:
     - 'spec/tooling/lib/tooling/find_changes_spec.rb'
     - 'spec/tooling/lib/tooling/helpers/file_handler_spec.rb'
     - 'spec/tooling/lib/tooling/helpers/predictive_tests_helper_spec.rb'
-    - 'spec/tooling/lib/tooling/job_metrics_spec.rb'
     - 'spec/uploaders/file_uploader_spec.rb'
     - 'spec/uploaders/object_storage_spec.rb'
     - 'spec/views/groups/group_members/index.html.haml_spec.rb'
@@ -2334,5 +2333,4 @@ Style/InlineDisableAnnotation:
     - 'tooling/lib/tooling/find_changes.rb'
     - 'tooling/lib/tooling/gettext_extractor.rb'
     - 'tooling/lib/tooling/helm3_client.rb'
-    - 'tooling/lib/tooling/job_metrics.rb'
     - 'tooling/lib/tooling/kubernetes_client.rb'

Gemfile

@@ -171,6 +171,7 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
 # Cells
 gem 'gitlab-topology-service-client', '~> 0.1',
   path: 'vendor/gems/gitlab-topology-service-client',
+  require: 'gitlab/cells/topology_service',
   feature_category: :cell
 
 # Duo Workflow
@@ -528,9 +529,6 @@ group :development, :test do
   gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared
   gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared
 
-  # Profiling data from CI/CD pipelines
-  gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
-
   gem 'knapsack', '~> 4.0.0', feature_category: :tooling
   gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling
   gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling

Gemfile.lock

@@ -2229,7 +2229,6 @@ DEPENDENCIES
   httparty (~> 0.23.0)
   i18n_data (~> 0.13.1)
   icalendar (~> 2.10.1)
-  influxdb-client (~> 3.1)
   invisible_captcha (~> 2.3.0)
   io-event (~> 1.12)
   ipaddress (~> 0.8.3)

Gemfile.next.lock

@@ -2224,7 +2224,6 @@ DEPENDENCIES
   httparty (~> 0.23.0)
   i18n_data (~> 0.13.1)
   icalendar (~> 2.10.1)
-  influxdb-client (~> 3.1)
   invisible_captcha (~> 2.3.0)
   io-event (~> 1.12)
   ipaddress (~> 0.8.3)

app/assets/javascripts/environments/components/environment_stop.vue

@@ -6,7 +6,7 @@
 
 import { GlTooltipDirective, GlButton, GlModalDirective } from '@gitlab/ui';
 import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants';
-import { s__ } from '~/locale';
+import { s__, sprintf } from '~/locale';
 import setEnvironmentToStopMutation from '../graphql/mutations/set_environment_to_stop.mutation.graphql';
 import isEnvironmentStoppingQuery from '../graphql/queries/is_environment_stopping.query.graphql';
 
@@ -34,6 +34,7 @@ export default {
   },
   i18n: {
     stopTitle: s__('Environments|Stop environment'),
+    stopLabel: s__('Environments|Stop environment %{environmentName}'),
     stoppingTitle: s__('Environments|Stopping environment'),
   },
   data() {
@@ -49,6 +50,9 @@ export default {
     title() {
       return this.isLoadingState ? this.$options.i18n.stoppingTitle : this.$options.i18n.stopTitle;
     },
+    stopLabel() {
+      return sprintf(this.$options.i18n.stopLabel, { environmentName: this.environment?.name });
+    },
   },
   methods: {
     onClick() {
@@ -69,8 +73,9 @@ export default {
     :title="title"
     :tabindex="isLoadingState ? 0 : null"
     :loading="isLoadingState"
-    :aria-label="title"
+    :aria-label="stopLabel"
     :class="{ 'gl-pointer-events-none': isLoadingState }"
+    data-testid="stop-environment-button"
     size="small"
     icon="stop"
     variant="danger"