diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 15:08:06 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 15:08:06 +0000 |
| commit | 6eeb69fc9a216bd1874cba85214af5b1da1a46d0 (patch) | |
| tree | 5def37365fe1296362791c709f48fc501a67a9cf /spec/fixtures | |
| parent | 7d6a0a215806cbcbd7e1918ad042d554e3b6459f (diff) | |
| parent | 27a75ea1757d1c1b67bf501ec333221ed5e92d04 (diff) | |
| download | gitlab-ce-6eeb69fc9a216bd1874cba85214af5b1da1a46d0.tar.gz | |
Merge branch 'jprovazn-rebase' into 'master'
Backport 'Rebase' feature from EE to CE
Closes #40301
See merge request gitlab-org/gitlab-ce!16071
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_basic.json | 1 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 6 |
2 files changed, 6 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 995f13381ad..f1199468d53 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_basic.json +++ b/spec/fixtures/api/schemas/entities/merge_request_basic.json @@ -9,6 +9,7 @@ "human_time_estimate": { "type": ["string", "null"] }, "human_total_time_spent": { "type": ["string", "null"] }, "merge_error": { "type": ["string", "null"] }, + "rebase_in_progress": { "type": "boolean" }, "assignee_id": { "type": ["integer", "null"] }, "subscribed": { "type": ["boolean", "null"] }, "participants": { "type": "array" } diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index 9de27bee751..7f662098216 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -103,7 +103,11 @@ "remove_source_branch": { "type": ["boolean", "null"] }, "merge_ongoing": { "type": "boolean" }, "ff_only_enabled": { "type": ["boolean", false] }, - "should_be_rebased": { "type": "boolean" } + "should_be_rebased": { "type": "boolean" }, + "rebase_commit_sha": { "type": ["string", "null"] }, + "rebase_in_progress": { "type": "boolean" }, + "can_push_to_source_branch": { "type": "boolean" }, + "rebase_path": { "type": ["string", "null"] } }, "additionalProperties": false } |