summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2016-11-03 14:12:20 +0000
committerNick Thomas <nick@gitlab.com>2016-11-04 04:01:08 +0000
commitc1388d0efb79b755c06b9db19fc4ad47af7cf0a3 (patch)
tree4f1bbfca15dc287d2b14a68f4e5167c18f5a1b10 /lib
parent3a8a7c1251cef4098ffbc54718ba21736c5e2800 (diff)
downloadgitlab-ce-c1388d0efb79b755c06b9db19fc4ad47af7cf0a3.tar.gz
Allow multiple repository storage shards to be enabled, and automatically round-robin between them
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb1
-rw-r--r--lib/api/settings.rb4
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index d52496451a2..1f378ba1635 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -509,6 +509,7 @@ module API
expose :after_sign_out_path
expose :container_registry_token_expire_delay
expose :repository_storage
+ expose :repository_storages
expose :koding_enabled
expose :koding_url
end
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index c885fcd7ea3..c4cb1c7924a 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -17,12 +17,12 @@ module API
present current_settings, with: Entities::ApplicationSetting
end
- # Modify applicaiton settings
+ # Modify application settings
#
# Example Request:
# PUT /application/settings
put "application/settings" do
- attributes = current_settings.attributes.keys - ["id"]
+ attributes = ["repository_storage"] + current_settings.attributes.keys - ["id"]
attrs = attributes_for_keys(attributes)
if current_settings.update_attributes(attrs)