Merge branch...

Merge branch '119431-dependancy-scanning-ignores-dependency_scanning_disabled-if-ds_disable_dind-is-set' into 'master'

Do not ignore DEPENDENCY_SCANNING_DISABLED if DS_DISABLE_DIND is set

See merge request gitlab-org/gitlab!22172

changelogs/unreleased/22171-fix-disabling-dependency-scanning.yml

+---
+title: Check both DEPENDENCY_SCANNING_DISABLED and DS_DISABLE_DIND when executing Dependency Scanning job template
+merge_request: 22172
+author:
+type: fixed

lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml

@@ -77,6 +77,7 @@ dependency_scanning:
   services: []
   except:
     variables:
+      - $DEPENDENCY_SCANNING_DISABLED
       - $DS_DISABLE_DIND == 'false'
   script:
     - /analyzer run