summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-10-23 12:07:05 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-10-23 12:07:05 +0000
commit708875ae9ed2a9da0669ebca2bf68259a57bc056 (patch)
tree5737b19637c42a93e2825053f29d95a7a2d8f1ba /spec/lib
parentb336dcb7c30070b36017793a480ca0cd9abf3d90 (diff)
parentbc333f38d82097288586d0847d6f8e31738e8575 (diff)
downloadgitlab-ce-708875ae9ed2a9da0669ebca2bf68259a57bc056.tar.gz
Merge branch 'support-license-management-and-performance' into 'master'
Support licenses and performance See merge request gitlab-org/gitlab-ce!22175
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/ci/config/entry/reports_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/lib/gitlab/ci/config/entry/reports_spec.rb b/spec/lib/gitlab/ci/config/entry/reports_spec.rb
index 7cf541447ce..8095a231cf3 100644
--- a/spec/lib/gitlab/ci/config/entry/reports_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/reports_spec.rb
@@ -38,6 +38,8 @@ describe Gitlab::Ci::Config::Entry::Reports do
:dependency_scanning | 'gl-dependency-scanning-report.json'
:container_scanning | 'gl-container-scanning-report.json'
:dast | 'gl-dast-report.json'
+ :license_management | 'gl-license-management-report.json'
+ :performance | 'performance.json'
end
with_them do