summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-05-24 21:54:57 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-05-24 21:54:57 -0300
commit33923a49f85cb814f87a495d63c09503f53466e4 (patch)
tree5da5380a9d23594bfaad0a2fa3a6779045945de4 /spec/fixtures
parent9b479f4305c030257a6b179780c911f215c65482 (diff)
downloadgitlab-ce-33923a49f85cb814f87a495d63c09503f53466e4.tar.gz
Expose remove_source_branch boolean/null
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json
index 4afbb87453e..b6a59a6cc47 100644
--- a/spec/fixtures/api/schemas/entities/merge_request.json
+++ b/spec/fixtures/api/schemas/entities/merge_request.json
@@ -92,7 +92,8 @@
"diverged_commits_count": { "type": "integer" },
"commit_change_content_path": { "type": "string" },
"remove_wip_path": { "type": "string" },
- "commits_count": { "type": "integer" }
+ "commits_count": { "type": "integer" },
+ "remove_source_branch": { "type": ["boolean", "null"] }
},
"additionalProperties": false
}