summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-06-12 19:26:29 +0000
committerRobert Speicher <robert@gitlab.com>2016-06-12 19:26:29 +0000
commit8d243f9bdacea1909bf503eb715bd437c3b48aa7 (patch)
tree122885cdf932838647df64a240185e1f1ff8b98c /doc
parent714a60b45c07fe1fd241863230422d2f76e4bcb6 (diff)
parenta85dde9182f177cc2fdabd90ccdad870bf4d84c3 (diff)
downloadgitlab-ce-8d243f9bdacea1909bf503eb715bd437c3b48aa7.tar.gz
Merge branch 'fix-closes-issues-error-500' into 'master'
Fix Error 500 when using closes_issues API with an external issue tracker Closes #18484 See merge request !4608
Diffstat (limited to 'doc')
-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