diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-23 12:07:05 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-23 12:07:05 +0000 |
| commit | 708875ae9ed2a9da0669ebca2bf68259a57bc056 (patch) | |
| tree | 5737b19637c42a93e2825053f29d95a7a2d8f1ba /lib/gitlab/ci | |
| parent | b336dcb7c30070b36017793a480ca0cd9abf3d90 (diff) | |
| parent | bc333f38d82097288586d0847d6f8e31738e8575 (diff) | |
| download | gitlab-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 'lib/gitlab/ci')
| -rw-r--r-- | lib/gitlab/ci/config/entry/reports.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/reports.rb b/lib/gitlab/ci/config/entry/reports.rb index 98f12c226b3..3ac2a6fa777 100644 --- a/lib/gitlab/ci/config/entry/reports.rb +++ b/lib/gitlab/ci/config/entry/reports.rb @@ -11,7 +11,7 @@ module Gitlab include Validatable include Attributable - ALLOWED_KEYS = %i[junit codequality sast dependency_scanning container_scanning dast].freeze + ALLOWED_KEYS = %i[junit codequality sast dependency_scanning container_scanning dast performance license_management].freeze attributes ALLOWED_KEYS @@ -26,6 +26,8 @@ module Gitlab validates :dependency_scanning, array_of_strings_or_string: true validates :container_scanning, array_of_strings_or_string: true validates :dast, array_of_strings_or_string: true + validates :performance, array_of_strings_or_string: true + validates :license_management, array_of_strings_or_string: true end end |