diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/validators | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/validators')
-rw-r--r-- | app/validators/json_schemas/ci_runner_config.json | 9 | ||||
-rw-r--r-- | app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json | 37 |
2 files changed, 23 insertions, 23 deletions
diff --git a/app/validators/json_schemas/ci_runner_config.json b/app/validators/json_schemas/ci_runner_config.json new file mode 100644 index 00000000000..af1bcfcb183 --- /dev/null +++ b/app/validators/json_schemas/ci_runner_config.json @@ -0,0 +1,9 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "description": "CI Runner config values", + "type": "object", + "properties": { + "gpus": { "type": "string" } + }, + "additionalProperties": false +} diff --git a/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json b/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json index 7c3720dd2e6..20be49f9eae 100644 --- a/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json +++ b/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json @@ -18,15 +18,6 @@ "value": "", "size": "MEDIUM", "description": "Comma-separated list of paths to be excluded from analyzer output. Patterns can be globs, file paths, or folder paths." - }, - { - "field" : "SAST_ANALYZER_IMAGE_TAG", - "label" : "Image tag", - "type": "string", - "default_value": "", - "value": "", - "size": "SMALL", - "description": "Analyzer image's tag" } ], "pipeline": [ @@ -109,20 +100,6 @@ ] }, { - "name": "kubesec", - "label": "Kubesec", - "enabled" : true, - "description": "Kubernetes manifests, Helm Charts", - "variables": [] - }, - { - "name": "nodejs-scan", - "label": "Node.js Scan", - "enabled" : true, - "description": "Node.js", - "variables": [] - }, - { "name": "gosec", "label": "Gosec", "enabled" : true, @@ -140,6 +117,20 @@ ] }, { + "name": "kubesec", + "label": "Kubesec", + "enabled" : true, + "description": "Kubernetes manifests, Helm Charts", + "variables": [] + }, + { + "name": "nodejs-scan", + "label": "Node.js Scan", + "enabled" : true, + "description": "Node.js", + "variables": [] + }, + { "name": "phpcs-security-audit", "label": "PHP Security Audit", "enabled" : true, |