Merge branch '8661-add-ci-template-for-dependency-scanning-ce' into 'master'

Add Dependency Scanning vendored template for EE

See merge request gitlab-org/gitlab-ce!25555

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

@@ -0,0 +1,44 @@
+# Read more about this feature here: https://docs.gitlab.com/ee/user/project/merge_requests/dependency_scanning.html
+#
+# Configure the scanning tool through the environment variables.
+# List of the variables: https://gitlab.com/gitlab-org/security-products/dependency-scanning#settings
+# How to set: https://docs.gitlab.com/ee/ci/yaml/#variables
+
+stages:
+  - test
+
+dependency_scanning:
+  stage: test
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export DS_VERSION=${SP_VERSION:-$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')}
+    - |
+      docker run \
+        --env DS_ANALYZER_IMAGES \
+        --env DS_ANALYZER_IMAGE_PREFIX \
+        --env DS_ANALYZER_IMAGE_TAG \
+        --env DS_DEFAULT_ANALYZERS \
+        --env DEP_SCAN_DISABLE_REMOTE_CHECKS \
+        --env DS_DOCKER_CLIENT_NEGOTIATION_TIMEOUT \
+        --env DS_PULL_ANALYZER_IMAGE_TIMEOUT \
+        --env DS_RUN_ANALYZER_TIMEOUT \
+        --volume "$PWD:/code" \
+        --volume /var/run/docker.sock:/var/run/docker.sock \
+        "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$DS_VERSION" /code
+  artifacts:
+    reports:
+      dependency_scanning: gl-dependency-scanning-report.json
+  dependencies: []
+  only:
+    refs:
+      - branches
+    variables:
+      - $GITLAB_FEATURES =~ /\bdependency_scanning\b/
+  except:
+    variables:
+      - $DEPENDENCY_SCANNING_DISABLED

lib/gitlab/template/gitlab_ci_yml_template.rb

@@ -28,11 +28,6 @@ module Gitlab
         def finder(project = nil)
           Gitlab::Template::Finders::GlobalTemplateFinder.new(self.base_dir, self.extension, self.categories)
         end
-
-        def dropdown_names(context)
-          categories = context == 'autodeploy' ? ['Auto deploy'] : %w(General Pages)
-          super().slice(*categories)
-        end
       end
     end
   end