diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-05-29 20:51:43 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-05-29 20:51:43 +1100 |
| commit | 4cff66a6c46361e8d775ea3f5a80bf147d4020b3 (patch) | |
| tree | f1f76411400f35f394fedd28ad03d42ccbaf990e /spec/fixtures/api/schemas/entities/merge_request_widget.json | |
| parent | 6e354cb642f911dc71be3d5368f066900fc25970 (diff) | |
| download | gitlab-ce-4cff66a6c46361e8d775ea3f5a80bf147d4020b3.tar.gz | |
Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce
Diffstat (limited to 'spec/fixtures/api/schemas/entities/merge_request_widget.json')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index 233102c4314..7be8c9e3e67 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -112,7 +112,8 @@ "rebase_commit_sha": { "type": ["string", "null"] }, "rebase_in_progress": { "type": "boolean" }, "can_push_to_source_branch": { "type": "boolean" }, - "rebase_path": { "type": ["string", "null"] } + "rebase_path": { "type": ["string", "null"] }, + "squash": { "type": "boolean" } }, "additionalProperties": false } |