diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 21:07:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 21:07:52 +0000 |
commit | 03a70b84edfb86bc27f9234e1f1d157d3a33c555 (patch) | |
tree | d8df46fee3e5a97d3b9dbd7d2e69ccc9e3601de1 /app | |
parent | 165beade336f9049f95db3944b1c5c00a1e952cf (diff) | |
download | gitlab-ce-03a70b84edfb86bc27f9234e1f1d157d3a33c555.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/models/application_setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 3d55269e36f..64ca7446fa5 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -137,7 +137,7 @@ class ApplicationSetting < ApplicationRecord validates :max_pages_size, presence: true, - numericality: { only_integer: true, greater_than: 0, + numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than: ::Gitlab::Pages::MAX_SIZE / 1.megabyte } validates :default_artifacts_expire_in, presence: true, duration: true |