summaryrefslogtreecommitdiff
path: root/lib/api/settings.rb
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-07-13 18:03:52 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2017-07-27 11:49:27 +0200
commitea1012ccb4da9c8e0dae1a9cb710b39c97baa8a1 (patch)
treed40d07d77a3839bfccfdfa5a84e9063c5c0d4e18 /lib/api/settings.rb
parent2e483ca9e3cd2ff25d6ae0a69d2d9b5fcea7267c (diff)
downloadgitlab-ce-ea1012ccb4da9c8e0dae1a9cb710b39c97baa8a1.tar.gz
Make the attribute list for application settings reusable
Diffstat (limited to 'lib/api/settings.rb')
-rw-r--r--lib/api/settings.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index b19095d1252..ca21f3e6f4c 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -174,7 +174,8 @@ module API
optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.'
optional :polling_interval_multiplier, type: BigDecimal, desc: 'Interval multiplier used by endpoints that perform polling. Set to 0 to disable polling.'
- at_least_one_of(*at_least_one_of_ce)
+ optional(*::ApplicationSettingsHelper.visible_attributes)
+ at_least_one_of(*::ApplicationSettingsHelper.visible_attributes)
end
put "application/settings" do
attrs = declared_params(include_missing: false)