diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-06 21:29:03 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-06 21:29:03 +0900 |
| commit | 91e530df246c6898f4e92e8cb61dde6f52304999 (patch) | |
| tree | 5015b0340530696a5a48e2d8cce943749f3e129c /spec/fixtures | |
| parent | f293288589f24e1928b57dcd3428b762ae9ced79 (diff) | |
| parent | 9560d5b8399df42109e5768f19a99d0d5a664bd9 (diff) | |
| download | gitlab-ce-91e530df246c6898f4e92e8cb61dde6f52304999.tar.gz | |
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 30b4e56bc98..ba094ba1657 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -46,6 +46,7 @@ "branch_missing": { "type": "boolean" }, "has_conflicts": { "type": "boolean" }, "can_be_merged": { "type": "boolean" }, + "mergeable": { "type": "boolean" }, "project_archived": { "type": "boolean" }, "only_allow_merge_if_pipeline_succeeds": { "type": "boolean" }, "has_ci": { "type": "boolean" }, |