summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2017-09-07 15:20:04 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2017-09-07 15:20:04 +0200
commit62a5cc7134457d21bf3a68bfdb04e090cf0e6ecf (patch)
treeb69d47581d803acd0b456cbf1576a9072624c1f2 /lib/api/api.rb
parent492eaece7ec80090fd7276758798a2af49fe9763 (diff)
parent0c2dc7273819b29efcb77a347af0116aeb5a9927 (diff)
downloadgitlab-ce-62a5cc7134457d21bf3a68bfdb04e090cf0e6ecf.tar.gz
Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-table
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 1405a5d0f0e..d9a62bffb6d 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -144,6 +144,7 @@ module API
mount ::API::Variables
mount ::API::GroupVariables
mount ::API::Version
+ mount ::API::Wikis
route :any, '*path' do
error!('404 Not Found', 404)