diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 18:07:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 18:07:53 +0300 |
| commit | a5ab3467a705b62911feacc3cf627fdbb00aa198 (patch) | |
| tree | 65143ce13405efccb922fc428624ad57c38b6efa /app/models/application_setting.rb | |
| parent | eb30dd6e28f6fc9eb8021d205f6ed84511f001e2 (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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 3858adfc71f..a0a600a340e 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -169,7 +169,11 @@ class ApplicationSetting < ApplicationRecord validates :gitaly_timeout_default, presence: true, - numericality: { only_integer: true, greater_than_or_equal_to: 0 } + numericality: { + only_integer: true, + greater_than_or_equal_to: 0, + less_than_or_equal_to: Settings.gitlab.max_request_duration_seconds + } validates :gitaly_timeout_medium, presence: true, |