diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-06 18:20:38 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-06 18:20:38 +0000 |
| commit | c07311d486fd177bff6df8b2f912dc91dcadac4e (patch) | |
| tree | 614735e4f3d0a495abc2ac84573fc55e4a9bf0db /lib/api | |
| parent | 853314c1936506573f5b6c520fce6fd43b998229 (diff) | |
| parent | b988faaf85c8e68d501f242b980e5e79a00e2b15 (diff) | |
| download | gitlab-ce-c07311d486fd177bff6df8b2f912dc91dcadac4e.tar.gz | |
Merge branch 'jej-pages-to-ce' into 'master'
Adding GitLab Pages to CE
Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323
See merge request !8463
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/settings.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index a1d1c1432d3..747ceb4e3e0 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 @@ -116,7 +117,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, |