summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-06 15:45:58 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-06 15:45:58 +0000
commit8ecad3d137d04dca8a3ad0fb0ccc9760b87a863e (patch)
tree28db6016d39f55587e7005ecc1f6036215609804 /lib/api/api.rb
parent53db7d1d75e1d14cb20278bd0c1a75ce24a6626d (diff)
parentc2d64d67027ca4170deb24c8b5868d127bba157c (diff)
downloadgitlab-ce-8ecad3d137d04dca8a3ad0fb0ccc9760b87a863e.tar.gz
Merge branch '9-0-api-changes' into 'master'
V4 API: Remove deprecated MR and Issue endpoints and preserve V3 namespace Closes #27180 See merge request !8967
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