diff options
author | Robert Speicher <robert@gitlab.com> | 2017-07-12 16:52:37 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-07-12 16:52:37 +0000 |
commit | 777ec2106415f464c3fe98643a41e847861fede3 (patch) | |
tree | cdc70f4e0765debc2a13d95c76011ad36f9bcd10 /spec/fixtures | |
parent | bc1bb50685fc5d7dd588079304719307edbb4c05 (diff) | |
parent | 531157f5b4e35393cb1952365a534dbab6252950 (diff) | |
download | gitlab-ce-777ec2106415f464c3fe98643a41e847861fede3.tar.gz |
Merge branch 'mr-branch-link-use-tree' into 'master'
MR branch link now links to tree instead of commits
Closes #34243
See merge request !12763
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 b6a59a6cc47..7ffa82fc4bd 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -75,6 +75,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" }, |