summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2019-04-16 13:06:52 +0200
committerMatija Čupić <matteeyah@gmail.com>2019-04-16 13:06:52 +0200
commit0cfa25ff21322d45aaef91fc7a3dd7c570632a05 (patch)
tree11e9c6393808c22ecb0bfd3ccee945a39029145f /lib
parentfc1dfae41c7e6e1bbaa95bc4a1e087ffddfcc57b (diff)
downloadgitlab-ce-0cfa25ff21322d45aaef91fc7a3dd7c570632a05.tar.gz
Backport changes from EE
This backports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10452
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/config/entry/reports.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/reports.rb b/lib/gitlab/ci/config/entry/reports.rb
index a3f6cc31321..eeaac52eefd 100644
--- a/lib/gitlab/ci/config/entry/reports.rb
+++ b/lib/gitlab/ci/config/entry/reports.rb
@@ -11,7 +11,7 @@ module Gitlab
include ::Gitlab::Config::Entry::Validatable
include ::Gitlab::Config::Entry::Attributable
- ALLOWED_KEYS = %i[junit codequality sast dependency_scanning container_scanning dast performance license_management].freeze
+ ALLOWED_KEYS = %i[junit codequality sast dependency_scanning container_scanning dast performance license_management metrics].freeze
attributes ALLOWED_KEYS
@@ -28,6 +28,7 @@ module Gitlab
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
+ validates :metrics, array_of_strings_or_string: true
end
end