summaryrefslogtreecommitdiff
path: root/app/models/ci/job_artifact.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-08 12:08:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-08 12:08:26 +0000
commitf149549c3432ffb179f6904e4ba0ea64027202d0 (patch)
tree9c6dca1e76c0de43e5e5f6b5d34c5616abbc7501 /app/models/ci/job_artifact.rb
parentb001207ce2033589373cd7558ca69c4e5732ce6b (diff)
downloadgitlab-ce-f149549c3432ffb179f6904e4ba0ea64027202d0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci/job_artifact.rb')
-rw-r--r--app/models/ci/job_artifact.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index 33ba2af00e9..f87f97722fb 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -39,7 +39,8 @@ module Ci
dotenv: '.env',
cobertura: 'cobertura-coverage.xml',
terraform: 'tfplan.json',
- cluster_applications: 'gl-cluster-applications.json'
+ cluster_applications: 'gl-cluster-applications.json',
+ requirements: 'requirements.json'
}.freeze
INTERNAL_TYPES = {
@@ -71,7 +72,8 @@ module Ci
license_management: :raw,
license_scanning: :raw,
performance: :raw,
- terraform: :raw
+ terraform: :raw,
+ requirements: :raw
}.freeze
DOWNLOADABLE_TYPES = %w[
@@ -90,6 +92,7 @@ module Ci
metrics
performance
sast
+ requirements
].freeze
TYPE_AND_FORMAT_PAIRS = INTERNAL_TYPES.merge(REPORT_TYPES).freeze
@@ -182,7 +185,8 @@ module Ci
terraform: 18, # Transformed json
accessibility: 19,
cluster_applications: 20,
- secret_detection: 21 ## EE-specific
+ secret_detection: 21, ## EE-specific
+ requirements: 22 ## EE-specific
}
enum file_format: {