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/public_api/v4/merge_requests.json | |
| parent | 6e354cb642f911dc71be3d5368f066900fc25970 (diff) | |
| download | gitlab-ce-blackst0ne-squash-and-merge-in-gitlab-core-ce.tar.gz | |
Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce
Diffstat (limited to 'spec/fixtures/api/schemas/public_api/v4/merge_requests.json')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/merge_requests.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json index 0dc2eabec5d..f97461ce9cc 100644 --- a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json +++ b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json @@ -75,6 +75,7 @@ "force_remove_source_branch": { "type": ["boolean", "null"] }, "discussion_locked": { "type": ["boolean", "null"] }, "web_url": { "type": "uri" }, + "squash": { "type": "boolean" }, "time_stats": { "time_estimate": { "type": "integer" }, "total_time_spent": { "type": "integer" }, @@ -91,7 +92,7 @@ "labels", "work_in_progress", "milestone", "merge_when_pipeline_succeeds", "merge_status", "sha", "merge_commit_sha", "user_notes_count", "should_remove_source_branch", "force_remove_source_branch", - "web_url" + "web_url", "squash" ], "additionalProperties": false } |