summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 00:08:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 00:08:09 +0000
commitf6e2f302412fcb32b644b379778964791789cb62 (patch)
tree29ed98fca33be12adc21ee75185a459c668fb7da /app/controllers
parent95ad46159e4cd93f2b31838199180d824e041994 (diff)
downloadgitlab-ce-f6e2f302412fcb32b644b379778964791789cb62.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/application_settings_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index ce71730cef1..1ee3c52ad35 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -217,6 +217,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:lets_encrypt_terms_of_service_accepted,
:domain_blacklist_file,
:raw_blob_request_limit,
+ :namespace_storage_size_limit,
disabled_oauth_sign_in_sources: [],
import_sources: [],
repository_storages: [],