summaryrefslogtreecommitdiff
path: root/app/models/application_setting.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-02-05 10:12:36 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-02-09 12:11:16 +0100
commit1cbc75b53cac7a494d673ee73be126aec131b296 (patch)
treed26f5ecbd673a561ef2df1fa12186ef7c926e2d7 /app/models/application_setting.rb
parentceb342c71648d8055b1dc2c8909a563f82edfcef (diff)
downloadgitlab-ce-1cbc75b53cac7a494d673ee73be126aec131b296.tar.gz
Validate maximum attachment size in application settings
`max_attachment_size` in `ApplicationSetting` should be present, only integers greater than zero are valid. Closes #13188
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 9cafc78f761..5e1cf7749fa 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -92,6 +92,10 @@ class ApplicationSetting < ActiveRecord::Base
presence: true,
if: :akismet_enabled
+ validates :max_attachment_size,
+ presence: true,
+ numericality: { only_integer: true, greater_than: 0 }
+
validates_each :restricted_visibility_levels do |record, attr, value|
unless value.nil?
value.each do |level|