summaryrefslogtreecommitdiff
path: root/app/models/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 15:08:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 15:08:01 +0000
commita7df1d8717d39424ced032d9fe063f08f97e19d6 (patch)
treef887841557b509e950475176baa4d405bfd411f4 /app/models/ci
parente3e300557f5def9bf2271735c8a620e6820dfada (diff)
downloadgitlab-ce-a7df1d8717d39424ced032d9fe063f08f97e19d6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
-rw-r--r--app/models/ci/job_artifact.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index 62bf2c3ac9c..9e5aa6691df 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -23,6 +23,7 @@ module Ci
container_scanning: 'gl-container-scanning-report.json',
dast: 'gl-dast-report.json',
license_management: 'gl-license-management-report.json',
+ license_scanning: 'gl-license-management-report.json',
performance: 'performance.json',
metrics: 'metrics.txt'
}.freeze
@@ -46,6 +47,7 @@ module Ci
container_scanning: :raw,
dast: :raw,
license_management: :raw,
+ license_scanning: :raw,
performance: :raw
}.freeze
@@ -104,6 +106,7 @@ module Ci
dast: 8, ## EE-specific
codequality: 9, ## EE-specific
license_management: 10, ## EE-specific
+ license_scanning: 101, ## EE-specific till 13.0
performance: 11, ## EE-specific
metrics: 12 ## EE-specific
}