summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2017-02-06 17:19:50 +0100
committerMarin Jankovski <maxlazio@gmail.com>2017-02-06 17:19:50 +0100
commit707ce83740b396b074ff06a83411f1dcd5596367 (patch)
treea830b54431bc8a3db1213fcbb887287455e7578b /lib/api/api.rb
parenta8b4c75f21c25b1ce6cbbb904df077522007fc20 (diff)
parentefe38da9496f575aaf0e2af0828e2c94c7d683cb (diff)
downloadgitlab-ce-707ce83740b396b074ff06a83411f1dcd5596367.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/api/api.rb')
-rw-r--r--lib/api/api.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 090109d5e6f..1950d2791ab 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -5,6 +5,8 @@ module API
version %w(v3 v4), using: :path
version 'v3', using: :path do
+ mount ::API::V3::Issues
+ mount ::API::V3::MergeRequests
mount ::API::V3::Projects
end