summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-07-16 12:11:08 +0200
committerMarin Jankovski <maxlazio@gmail.com>2015-07-16 12:11:08 +0200
commitf502a83b052f4a99596971964908f5422884bfb0 (patch)
treee8e2d350210aaa4d09b7dd2108df620059af6f4d /doc/api
parentd9078749a5a2d78ed6b8253184a1aacdf9193cdc (diff)
parentbce9315ade66b97105eb49204cd1b462b3f98c23 (diff)
downloadgitlab-ce-f502a83b052f4a99596971964908f5422884bfb0.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/merge_requests.md8
1 files changed, 0 insertions, 8 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 7b0873a9111..7624fd3a3ef 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -336,14 +336,6 @@ Parameters:
```json
{
- "author": {
- "id": 1,
- "username": "admin",
- "email": "admin@example.com",
- "name": "Administrator",
- "blocked": false,
- "created_at": "2012-04-29T08:46:00Z"
- },
"note": "text1"
}
```