diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-03 08:24:31 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-03 08:24:31 +0000 |
commit | 0ac06c89e9cfc0fc8044b645294242d66af36150 (patch) | |
tree | cf72e186622982907975f06fc588c0542a56c35c /spec/fixtures/api/schemas/entities/merge_request.json | |
parent | 75f257ad57d29955fc25c49b39fb1833f7dd3c75 (diff) | |
parent | e559b8511b2817b9c57a5190ff9ed95c739528bf (diff) | |
download | gitlab-ce-0ac06c89e9cfc0fc8044b645294242d66af36150.tar.gz |
Merge branch 'ff_port_from_ee' into 'master'
Move Fast-Forward Merge to CE
See merge request gitlab-org/gitlab-ce!14272
Diffstat (limited to 'spec/fixtures/api/schemas/entities/merge_request.json')
-rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 1030f323a1f..0796d9b8af9 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -96,7 +96,9 @@ "remove_wip_path": { "type": "string" }, "commits_count": { "type": "integer" }, "remove_source_branch": { "type": ["boolean", "null"] }, - "merge_ongoing": { "type": "boolean" } + "merge_ongoing": { "type": "boolean" }, + "ff_only_enabled": { "type": ["boolean", false] }, + "should_be_rebased": { "type": "boolean" } }, "additionalProperties": false } |