Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 03:08:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 03:08:09 +0300
commitf6e2f302412fcb32b644b379778964791789cb62 (patch)
tree29ed98fca33be12adc21ee75185a459c668fb7da /app/models/application_setting.rb
parent95ad46159e4cd93f2b31838199180d824e041994 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 64ca7446fa5..9254f7dd633 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -337,6 +337,10 @@ class ApplicationSetting < ApplicationRecord
length: { maximum: 255 },
allow_blank: true
+ validates :namespace_storage_size_limit,
+ presence: true,
+ numericality: { only_integer: true, greater_than_or_equal_to: 0 }
+
attr_encrypted :asset_proxy_secret_key,
mode: :per_attribute_iv,
key: Settings.attr_encrypted_db_key_base_truncated,