Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 18 deletions

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index d2820149102..9c305503357 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -288,8 +288,11 @@ rspec:coverage:
     - rspec migration pg13
     - rspec background_migration pg13
     - rspec unit pg13
+    - rspec unit pg13 single-redis
     - rspec integration pg13
+    - rspec integration pg13 single-redis
     - rspec system pg13
+    - rspec system pg13 single-redis
     # as-if-foss jobs
     - rspec migration pg13-as-if-foss
     - rspec background_migration pg13-as-if-foss
@@ -300,8 +303,11 @@ rspec:coverage:
     - rspec-ee migration pg13
     - rspec-ee background_migration pg13
     - rspec-ee unit pg13
+    - rspec-ee unit pg13 single-redis
     - rspec-ee integration pg13
+    - rspec-ee integration pg13 single-redis
     - rspec-ee system pg13
+    - rspec-ee system pg13 single-redis
     # Memory jobs
     - memory-on-boot
   script:
diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml
index 9158e02da94..0290d0158b6 100644
--- a/.gitlab/ci/reports.gitlab-ci.yml
+++ b/.gitlab/ci/reports.gitlab-ci.yml
@@ -74,13 +74,6 @@ gemnasium-dependency_scanning:
 gemnasium-python-dependency_scanning:
   rules: !reference [".reports:rules:gemnasium-python-dependency_scanning", rules]
 
-yarn-audit-dependency_scanning:
-  extends: .ds-analyzer
-  image: "${REGISTRY_HOST}/${REGISTRY_GROUP}/security-products/analyzers/npm-audit:1"
-  variables:
-    TOOL: yarn
-  rules: !reference [".reports:rules:yarn-audit-dependency_scanning", rules]
-
 # Analyze dependencies for malicious behavior
 # See https://gitlab.com/gitlab-com/gl-security/security-research/package-hunter
 .package_hunter-base:
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 74257fbe293..4c473051ff5 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -2313,17 +2313,6 @@
     - <<: *if-default-refs
       changes: *python-patterns
 
-.reports:rules:yarn-audit-dependency_scanning:
-  rules:
-    - <<: *if-merge-request-labels-pipeline-expedite
-      when: never
-    - if: '$DEPENDENCY_SCANNING_DISABLED || $GITLAB_FEATURES !~ /\bdependency_scanning\b/'
-      when: never
-    # Run Dependency Scanning on master until https://gitlab.com/gitlab-org/gitlab/-/issues/361657 is resolved
-    - <<: *if-default-branch-refs
-    - <<: *if-default-refs
-      changes: *nodejs-patterns
-
 .reports:rules:test-dast:
   rules:
     - <<: *if-merge-request-labels-pipeline-expedite