summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-06-14 09:06:53 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-06-14 09:06:53 +0530
commitd0bcba1105686c2306414a402bf33c85a08a17a6 (patch)
tree2922086316008cf86e864e1dd8a251fd4878cb04 /doc/api
parentd754d99179f1ffe846fcc1d8e858163b39efc5dc (diff)
parentf34af6b83cc2663bb8a076f4df9c82047e5511ab (diff)
downloadgitlab-ce-d0bcba1105686c2306414a402bf33c85a08a17a6.tar.gz
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/merge_requests.md13
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 16b892dc3b7..2930f615fc1 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -572,7 +572,7 @@ GET /projects/:id/merge_requests/:merge_request_id/closes_issues
curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/76/merge_requests/1/closes_issues
```
-Example response:
+Example response when the GitLab issue tracker is used:
```json
[
@@ -618,6 +618,17 @@ Example response:
]
```
+Example response when an external issue tracker (e.g. JIRA) is used:
+
+```json
+[
+ {
+ "id" : "PROJECT-123",
+ "title" : "Title of this issue"
+ }
+]
+```
+
## Subscribe to a merge request
Subscribes the authenticated user to a merge request to receive notification. If