summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-04-16 16:31:24 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-04-16 16:31:24 +0000
commit9627c49eceb45668491796f64a99a8ee7a362131 (patch)
tree02f0c089d578400368516e09e54df21806eea926
parent134e478f10da3abb37f7c9973576969f702f1a3e (diff)
parent6063c0d98806bc2a7f3f12062c808e31bb1a89b2 (diff)
downloadgitlab-ce-9627c49eceb45668491796f64a99a8ee7a362131.tar.gz
Merge branch 'resource-label-events-api-link' into 'master'
Link to resource label events API See merge request gitlab-org/gitlab-ce!27412
-rw-r--r--doc/api/discussions.md2
-rw-r--r--doc/api/notes.md2
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/api/discussions.md b/doc/api/discussions.md
index 3f575f432d0..67bbd4cc1ac 100644
--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -2,6 +2,8 @@
Discussions are set of related notes on snippets, issues, merge requests or commits.
+This includes system notes, which are notes about changes to the object (for example, when a milestone changes, there will be a corresponding system note). Label notes are not part of this API, but recorded as separate events in [resource label events](resource_label_events.md).
+
## Discussions pagination
By default, `GET` requests return 20 results at a time because the API results
diff --git a/doc/api/notes.md b/doc/api/notes.md
index c351ee13d9a..dfde80c6441 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -2,6 +2,8 @@
Notes are comments on snippets, issues or merge requests.
+This includes system notes, which are notes about changes to the object (for example, when a milestone changes, there will be a corresponding system note). Label notes are not part of this API, but recorded as separate events in [resource label events](resource_label_events.md).
+
## Notes pagination
By default, `GET` requests return 20 results at a time because the API results