summaryrefslogtreecommitdiff
path: root/lib/api/settings.rb
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-02-02 22:21:06 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-02-02 22:21:06 +0000
commit67c8526033241f6bd190fa16622970b3919e6dbd (patch)
tree7f2a10016c17d8423a778bccdf436ffdb386ab07 /lib/api/settings.rb
parentc6dac7da6f5402333ccdd6f95d9b7b11300719f4 (diff)
downloadgitlab-ce-67c8526033241f6bd190fa16622970b3919e6dbd.tar.gz
Ported max_pages_size in settings API to CE
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 c5eff16a5de..5206ee4f521 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -57,6 +57,7 @@ module API
requires :shared_runners_text, type: String, desc: 'Shared runners text '
end
optional :max_artifacts_size, type: Integer, desc: "Set the maximum file size each build's artifacts can have"
+ optional :max_pages_size, type: Integer, desc: 'Maximum size of pages in MB'
optional :container_registry_token_expire_delay, type: Integer, desc: 'Authorization token duration (minutes)'
optional :metrics_enabled, type: Boolean, desc: 'Enable the InfluxDB metrics'
given metrics_enabled: ->(val) { val } do
@@ -115,7 +116,7 @@ module API
:send_user_confirmation_email, :domain_whitelist, :domain_blacklist_enabled,
:after_sign_up_text, :signin_enabled, :require_two_factor_authentication,
:home_page_url, :after_sign_out_path, :sign_in_text, :help_page_text,
- :shared_runners_enabled, :max_artifacts_size, :container_registry_token_expire_delay,
+ :shared_runners_enabled, :max_artifacts_size, :max_pages_size, :container_registry_token_expire_delay,
:metrics_enabled, :sidekiq_throttling_enabled, :recaptcha_enabled,
:akismet_enabled, :admin_notification_email, :sentry_enabled,
:repository_storage, :repository_checks_enabled, :koding_enabled, :plantuml_enabled,