diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-14 23:09:15 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-14 23:09:15 +0000 |
| commit | 5ca692b0b04b4f349fb5a08b9dcc7d87c774934e (patch) | |
| tree | 62eb8174333fcce0ccb826ef3fb9efae4ffd5b22 /spec/fixtures | |
| parent | 1bbce21f644809532454101adaa49039711cf86b (diff) | |
| parent | 84c14ac0c2ec4957f5fe4c53be3d068ee2f1743a (diff) | |
| download | gitlab-ce-5ca692b0b04b4f349fb5a08b9dcc7d87c774934e.tar.gz | |
Merge branch 'mc/fix/project-variables-scope' into 'master'
Resolve "Project variables validate without any scopes disregarding environment_scope"
Closes #43191
See merge request gitlab-org/gitlab-ce!17086
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/variable.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/variable.json b/spec/fixtures/api/schemas/variable.json index 78977118b0a..6f6b044115b 100644 --- a/spec/fixtures/api/schemas/variable.json +++ b/spec/fixtures/api/schemas/variable.json @@ -10,7 +10,8 @@ "id": { "type": "integer" }, "key": { "type": "string" }, "value": { "type": "string" }, - "protected": { "type": "boolean" } + "protected": { "type": "boolean" }, + "environment_scope": { "type": "string", "optional": true } }, "additionalProperties": false } |