summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-09 12:01:38 +0100
committerDouwe Maan <douwe@gitlab.com>2015-09-09 12:01:38 +0100
commit2c8d5aeaf332e25c030b7287919958bc7809e831 (patch)
treea6e308f25ba67279e713d0ed907d1e72f7f758b0 /lib/api/api.rb
parent58c487e28b3f10c8a871dc82f7d79a45c7876f15 (diff)
parente0da2c352325c1cb2ede88a73434ed7afc037481 (diff)
downloadgitlab-ce-2c8d5aeaf332e25c030b7287919958bc7809e831.tar.gz
Merge branch 'master' into reply-by-email-docs
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 eebd44ea5b6..c09488d3547 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -50,5 +50,6 @@ module API
mount Branches
mount Labels
mount Settings
+ mount Keys
end
end