diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 18:08:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 18:08:08 +0300 |
| commit | 946771d0b016ae92b15a60bc3290a33b94191ffe (patch) | |
| tree | 64862c2433989483f5fce45d5539242577a362eb /app/models/application_setting.rb | |
| parent | f1e2fca19a90a6992c2020cf8c2159cfb0b61bca (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 2f7d6164b9a..f9d7e8a2b7a 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -172,6 +172,7 @@ class ApplicationSetting < ApplicationRecord validates :gitaly_timeout_default, presence: true, + if: :gitaly_timeout_default_changed?, numericality: { only_integer: true, greater_than_or_equal_to: 0, @@ -180,6 +181,7 @@ class ApplicationSetting < ApplicationRecord validates :gitaly_timeout_medium, presence: true, + if: :gitaly_timeout_medium_changed?, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :gitaly_timeout_medium, numericality: { less_than_or_equal_to: :gitaly_timeout_default }, @@ -190,6 +192,7 @@ class ApplicationSetting < ApplicationRecord validates :gitaly_timeout_fast, presence: true, + if: :gitaly_timeout_fast_changed?, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :gitaly_timeout_fast, numericality: { less_than_or_equal_to: :gitaly_timeout_default }, |