Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-07-11 17:48:59 +0300
committerClement Ho <ClemMakesApps@gmail.com>2017-07-11 17:48:59 +0300
commit09193a4fe18044a61021afef1282ec60b81810b1 (patch)
treeec6107dd34bacca03bd71e6a04a5eb528d5d2dc7 /spec/fixtures
parent9e4e1afb4a7907f2a79d18fd9b5d03c9f6599ccf (diff)
Convert target branch link to use tree
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json
index b6a59a6cc47..b6cda963ffa 100644
--- a/spec/fixtures/api/schemas/entities/merge_request.json
+++ b/spec/fixtures/api/schemas/entities/merge_request.json
@@ -74,7 +74,7 @@
},
"additionalProperties": false
},
- "target_branch_commits_path": { "type": "string" },
+ "target_branch_tree_path": { "type": "string" },
"source_branch_path": { "type": "string" },
"conflict_resolution_path": { "type": ["string", "null"] },
"cancel_merge_when_pipeline_succeeds_path": { "type": "string" },