summaryrefslogtreecommitdiff
path: root/doc/api/notes.md
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2015-11-20 00:29:04 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2015-11-20 00:29:04 +0100
commit85ad95be741848fbf15a01789f065e001326cefa (patch)
tree496395e235a41b51e69c47e73e3440e5e4105666 /doc/api/notes.md
parent1144b70ab624ee1c1e7f2de0c92de021a7b5ea8e (diff)
parent0383f84d88d95183638d0e227f3446974eb4e387 (diff)
downloadgitlab-ce-85ad95be741848fbf15a01789f065e001326cefa.tar.gz
Merge branch 'master' into fix/visibility-level-setting-in-forked-projects
* master: (296 commits) fox tests Don't rescue Exception, but StandardError adressing comments Update gitlab-shell documentation [ci skip] Align hash literals in IssuesFinder spec Fix tests Fix 'Attach a file' link in new tag form Add link to git-lfs client [ci skip] Do not limit workhorse POST/PUT size in NGINX added specs added spinach tests Since GitLab CI is enabled by default, remove enabling it by pushing .gitlab-ci.yml Fix tests Commits without .gitlab-ci.yml are marked as skipped Changelog entry for finding issues performance Use a JOIN in IssuableFinder#by_project Memoize IssuableFinder#projects Removed trailing whitespace from IssuableFinder Added benchmark for IssuesFinder Updated DB schema with new issues/projects indexes ... Conflicts: app/models/project.rb
Diffstat (limited to 'doc/api/notes.md')
-rw-r--r--doc/api/notes.md8
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/api/notes.md b/doc/api/notes.md
index c683cb883d4..bcba1f62151 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -32,9 +32,7 @@ Parameters:
"created_at": "2013-09-30T13:46:01Z"
},
"created_at": "2013-10-02T09:22:45Z",
- "system": true,
- "upvote": false,
- "downvote": false
+ "system": true
},
{
"id": 305,
@@ -49,9 +47,7 @@ Parameters:
"created_at": "2013-09-30T13:46:01Z"
},
"created_at": "2013-10-02T09:56:03Z",
- "system": false,
- "upvote": false,
- "downvote": false
+ "system": false
}
]
```