summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
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 /lib/api/api.rb
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 'lib/api/api.rb')
-rw-r--r--lib/api/api.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 5e93c129bc8..62ffebeacb0 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -136,6 +136,7 @@ module API
mount ::API::MergeRequests
mount ::API::Namespaces
mount ::API::Notes
+ mount ::API::Discussions
mount ::API::NotificationSettings
mount ::API::PagesDomains
mount ::API::Pipelines