diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-14 03:07:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-14 03:07:31 +0300 |
| commit | dbfcd56fcbb4e148920094ab004ed175468911c3 (patch) | |
| tree | c4de3a22f7dc97e59f059c1aa472527650384525 /app/assets/javascripts/editor | |
| parent | 3f0848998ef99206e80ead8c68a50b5889d2ae19 (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json index 3b40970e62d..d94aa73e43a 100644 --- a/app/assets/javascripts/editor/schema/ci.json +++ b/app/assets/javascripts/editor/schema/ci.json @@ -336,10 +336,10 @@ "include_item": { "oneOf": [ { - "description": "Will infer the method based on the value. E.g. `https://...` strings will be of type `include:remote`, and `/templates/...` will be of type `include:local`.", + "description": "Will infer the method based on the value. E.g. `https://...` strings will be of type `include:remote`, and `/templates/...` or `templates/...` will be of type `include:local`.", "type": "string", "format": "uri-reference", - "pattern": "^(https?://|/).+\\.ya?ml$" + "pattern": "^(https?://|/?.?-?(?!\\w+://)\\w).+\\.ya?ml$" }, { "type": "object", |