diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-04 21:09:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-04 21:09:40 +0300 |
commit | fe448fa0fc6b02fd5c70da8f784476a9d27d70da (patch) | |
tree | 0f51541f1a7892e4edbd54fa7ffcc5712f7d0bbe /app/validators/json_schemas | |
parent | 99373ac711072bf8f3ea7c020cd240b73dbc2ba3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/validators/json_schemas')
-rw-r--r-- | app/validators/json_schemas/helm_metadata.json | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/app/validators/json_schemas/helm_metadata.json b/app/validators/json_schemas/helm_metadata.json index 7ac36e956f3..a5ff6f0b33a 100644 --- a/app/validators/json_schemas/helm_metadata.json +++ b/app/validators/json_schemas/helm_metadata.json @@ -103,7 +103,23 @@ "import-values": { "type": "array", "items": { - + "oneOf": [ + { + "type": "string" + }, + { + "type": "object", + "properties": { + "child": { + "type": "string" + }, + "parent": { + "type": "string" + } + }, + "additionalProperties": false + } + ] } }, "alias": { |