summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-07 10:57:41 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-07 10:57:41 +0000
commitf76092c06dd1f3b40a6d32ad3d62ea09bf32d1a0 (patch)
tree31b0ead46e605f7d3c4ede969f0c1c933b6cc471 /lib/api/api.rb
parent41e6b8d8d8bb183e9313219aa65ea6a786c76133 (diff)
parent603ceea21a0144ff1900106efa0c17e759eeceef (diff)
downloadgitlab-ce-f76092c06dd1f3b40a6d32ad3d62ea09bf32d1a0.tar.gz
Merge branch 'settings-via-api' into 'master'
API to set application settings for admin Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !934
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 d2a35c78fc1..eebd44ea5b6 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -49,5 +49,6 @@ module API
mount Namespaces
mount Branches
mount Labels
+ mount Settings
end
end