summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-09-27 09:21:06 +0000
committerRémy Coutable <remy@rymai.me>2018-09-27 09:21:06 +0000
commitad597a6aa8d5b31a7cf43028e7d60d33ac5d0d8c (patch)
tree0fc3d4ca0ca649153c90a500e29ee01fe4025ce9
parent2c8475e16f1d484d3a4897cb287fa7cfd44442f0 (diff)
parent098340b0b8a6383c4f37bb96754088544b6e45ec (diff)
downloadgitlab-ce-ad597a6aa8d5b31a7cf43028e7d60d33ac5d0d8c.tar.gz
Merge branch 'mr-api-diff-refs-doc' into 'master'
Add diff_refs documentation in single merge requests response. See merge request gitlab-org/gitlab-ce!21923
-rw-r--r--doc/api/merge_requests.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 9e6676d62fe..4c099581f07 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -437,6 +437,11 @@ Parameters:
"id" : 1,
"name" : "Administrator"
},
+ "diff_refs": {
+ "base_sha": "1111111111111111111111111111111111111111",
+ "head_sha": "2222222222222222222222222222222222222222",
+ "start_sha": "3333333333333333333333333333333333333333"
+ },
"diverged_commits_count": 2
}
```