diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-02-23 18:30:37 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-03-07 15:12:31 +0100 |
| commit | 792ab0631c85098fbf92e727b77158fb9dae5219 (patch) | |
| tree | 390bd2b69c2de7f229f4d073ad60282b473312d7 /spec/fixtures | |
| parent | 9ba0052cdd5ae12ea6b1edd8d25867e0fef25afc (diff) | |
| download | gitlab-ce-792ab0631c85098fbf92e727b77158fb9dae5219.tar.gz | |
Allow a user to select `allow maintainer to push`
When a project is not private, and the source branch not protected the
user can now select the option to allow maintainers to push to this
branch
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_basic.json | 3 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_basic.json b/spec/fixtures/api/schemas/entities/merge_request_basic.json index f1199468d53..46031961cca 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_basic.json +++ b/spec/fixtures/api/schemas/entities/merge_request_basic.json @@ -12,7 +12,8 @@ "rebase_in_progress": { "type": "boolean" }, "assignee_id": { "type": ["integer", "null"] }, "subscribed": { "type": ["boolean", "null"] }, - "participants": { "type": "array" } + "participants": { "type": "array" }, + "allow_maintainer_to_push": { "type": "boolean"} }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index cfbeec58a45..a622bf88b13 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -30,6 +30,7 @@ "source_project_id": { "type": "integer" }, "target_branch": { "type": "string" }, "target_project_id": { "type": "integer" }, + "allow_maintainer_to_push": { "type": "boolean"}, "metrics": { "oneOf": [ { "type": "null" }, |