Add latest changes from gitlab-org/gitlab@15-0-stable-ee

6 files changed, 19 insertions, 5 deletions

diff --git a/lib/backup/gitaly_backup.rb b/lib/backup/gitaly_backup.rb
index a8b0e7ad157..077eabdd131 100644
--- a/lib/backup/gitaly_backup.rb
+++ b/lib/backup/gitaly_backup.rb
@@ -19,6 +19,10 @@ module Backup
     def start(type, backup_repos_path, backup_id: nil)
       raise Error, 'already started' if started?
 
+      if type == :create && !incremental?
+        FileUtils.rm_rf(backup_repos_path)
+      end
+
       command = case type
                 when :create
                   'create'
@@ -34,7 +38,7 @@ module Backup
       if Feature.enabled?(:incremental_repository_backup)
         args += ['-layout', 'pointer']
         if type == :create
-          args += ['-incremental'] if @incremental
+          args += ['-incremental'] if incremental?
           args += ['-id', backup_id] if backup_id
         end
       end
@@ -68,6 +72,10 @@ module Backup
 
     private
 
+    def incremental?
+      @incremental
+    end
+
     # Schedule a new backup job through a non-blocking JSON based pipe protocol
     #
     # @see https://gitlab.com/gitlab-org/gitaly/-/blob/master/doc/gitaly-backup.md
diff --git a/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
index 04b1c4a6f73..6a6fc2cb702 100644
--- a/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.25.0'
+  DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
 
 .dast-auto-deploy:
   image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${DAST_AUTO_DEPLOY_IMAGE_VERSION}"
diff --git a/lib/gitlab/ci/templates/Jobs/Dependency-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Dependency-Scanning.gitlab-ci.yml
index 5c56594da78..b95b36fd555 100644
--- a/lib/gitlab/ci/templates/Jobs/Dependency-Scanning.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Dependency-Scanning.gitlab-ci.yml
@@ -156,6 +156,9 @@ gemnasium-python-dependency_scanning:
 
 bundler-audit-dependency_scanning:
   extends: .ds-analyzer
+  variables:
+    DS_ANALYZER_NAME: "bundler-audit"
+    DS_MAJOR_VERSION: 2
   script:
     - echo "This job was deprecated in GitLab 14.8 and removed in GitLab 15.0"
     - echo "For more information see https://gitlab.com/gitlab-org/gitlab/-/issues/347491"
@@ -165,6 +168,9 @@ bundler-audit-dependency_scanning:
 
 retire-js-dependency_scanning:
   extends: .ds-analyzer
+  variables:
+    DS_ANALYZER_NAME: "retire.js"
+    DS_MAJOR_VERSION: 2
   script:
     - echo "This job was deprecated in GitLab 14.8 and removed in GitLab 15.0"
     - echo "For more information see https://gitlab.com/gitlab-org/gitlab/-/issues/289830"
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index c29b5b74bfc..98c4216679f 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  AUTO_DEPLOY_IMAGE_VERSION: 'v2.25.0'
+  AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
 
 .auto-deploy:
   image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
index d09bb53a5b1..603be5b1cdb 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  AUTO_DEPLOY_IMAGE_VERSION: 'v2.25.0'
+  AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
 
 .auto-deploy:
   image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
diff --git a/lib/gitlab/usage/service_ping_report.rb b/lib/gitlab/usage/service_ping_report.rb
index e73200cbd4a..1eda72ba570 100644
--- a/lib/gitlab/usage/service_ping_report.rb
+++ b/lib/gitlab/usage/service_ping_report.rb
@@ -24,7 +24,7 @@ module Gitlab
 
           instrumented_payload = Gitlab::Usage::ServicePing::InstrumentedPayload.new(instrumented_metrics_key_paths, output_method).build
 
-          old_payload.deep_merge(instrumented_payload)
+          old_payload.with_indifferent_access.deep_merge(instrumented_payload)
         end
 
         def all_metrics_values(cached)