diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-16 03:11:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-16 03:11:15 +0300 |
| commit | d089b5729e472d68256aa39fade51e7ed99f042b (patch) | |
| tree | d668fe62261e53daa2b2c1a4b4b9019eaadecf06 /app/assets/javascripts/editor | |
| parent | c568cb4dbc0421212a28f3cd5b77223aad8888ba (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/editor')
| -rw-r--r-- | app/assets/javascripts/editor/schema/ci.json | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json index bce823f1106..f0db3e5594b 100644 --- a/app/assets/javascripts/editor/schema/ci.json +++ b/app/assets/javascripts/editor/schema/ci.json @@ -63,9 +63,9 @@ "items": { "type": "object", "properties": { - "if": { - "type": "string" - }, + "if": { "$ref": "#/definitions/if" }, + "changes": { "$ref": "#/definitions/changes" }, + "exists": { "$ref": "#/definitions/exists" }, "variables": { "$ref": "#/definitions/variables" }, "when": { "type": "string", @@ -497,24 +497,9 @@ "type": "object", "additionalProperties": false, "properties": { - "if": { - "type": "string", - "description": "Expression to evaluate whether additional attributes should be provided to the job" - }, - "changes": { - "type": "array", - "description": "Additional attributes will be provided to job if any of the provided paths matches a modified file", - "items": { - "type": "string" - } - }, - "exists": { - "type": "array", - "description": "Additional attributes will be provided to job if any of the provided paths matches an existing file in the repository", - "items": { - "type": "string" - } - }, + "if": { "$ref": "#/definitions/if" }, + "changes": { "$ref": "#/definitions/changes" }, + "exists": { "$ref": "#/definitions/exists" }, "variables": { "$ref": "#/definitions/variables" }, "when": { "$ref": "#/definitions/when" }, "start_in": { "$ref": "#/definitions/start_in" }, @@ -541,6 +526,24 @@ ] } }, + "if": { + "type": "string", + "description": "Expression to evaluate whether additional attributes should be provided to the job" + }, + "changes": { + "type": "array", + "description": "Additional attributes will be provided to job if any of the provided paths matches a modified file", + "items": { + "type": "string" + } + }, + "exists": { + "type": "array", + "description": "Additional attributes will be provided to job if any of the provided paths matches an existing file in the repository", + "items": { + "type": "string" + } + }, "variables": { "type": "object", "description": "Defines environment variables for specific jobs. Job level property overrides global variables. If a job sets `variables: {}`, all global variables are turned off.", |