summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-04-04 00:21:44 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-04-04 00:21:44 +0000
commit43f9d5d755db543df9f33bce5d386127e1b39575 (patch)
tree859de0c46f2e86d5b42b37be151f8744d693504e
parentea8cf8a8e55d85eda357e2bfc671d199147668e4 (diff)
parent1d88fa9c82236e0c80a18d5e8d55284ce5472a16 (diff)
downloadgitlab-ce-43f9d5d755db543df9f33bce5d386127e1b39575.tar.gz
Merge branch '10879/fix-security-template-inclusion' into 'master'
Include DAST as dependent CI template See merge request gitlab-org/gitlab-ce!26956
-rw-r--r--spec/lib/gitlab/ci/templates/templates_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/ci/templates/templates_spec.rb b/spec/lib/gitlab/ci/templates/templates_spec.rb
index e20a621168c..4e3681cd943 100644
--- a/spec/lib/gitlab/ci/templates/templates_spec.rb
+++ b/spec/lib/gitlab/ci/templates/templates_spec.rb
@@ -4,7 +4,9 @@ require 'spec_helper'
describe "CI YML Templates" do
ABSTRACT_TEMPLATES = %w[Serverless].freeze
- PROJECT_DEPENDENT_TEMPLATES = %w[Auto-DevOps].freeze
+ # These templates depend on the presence of the `project`
+ # param to enable processing of `include:` within CI config.
+ PROJECT_DEPENDENT_TEMPLATES = %w[Auto-DevOps DAST].freeze
def self.concrete_templates
Gitlab::Template::GitlabCiYmlTemplate.all.reject do |template|