summaryrefslogtreecommitdiff
path: root/doc/api/README.md
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-07 13:37:50 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-07 13:37:50 +0000
commit1da5a103ace9c346758e9525d7f0fa55bab13599 (patch)
tree34a492ec3b0ec833556a728faf1ece5a8f060b47 /doc/api/README.md
parent7e7f260dc54c7643e8d7ec8bf3fbded3dfc06fcc (diff)
parentdcdfa04b322db3905f6871a6857e7055c556547f (diff)
downloadgitlab-ce-1da5a103ace9c346758e9525d7f0fa55bab13599.tar.gz
Merge branch 'jprovazn-api' into 'master'
Add discussion API See merge request gitlab-org/gitlab-ce!17510
Diffstat (limited to 'doc/api/README.md')
-rw-r--r--doc/api/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/README.md b/doc/api/README.md
index b67500a9b9e..f40fd587c0a 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -37,6 +37,7 @@ following locations:
- [Group milestones](group_milestones.md)
- [Namespaces](namespaces.md)
- [Notes](notes.md) (comments)
+- [Threaded comments](discussions.md)
- [Notification settings](notification_settings.md)
- [Open source license templates](templates/licenses.md)
- [Pages Domains](pages_domains.md)