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 /spec/models/application_setting_spec.rb | |
| parent | f1e2fca19a90a6992c2020cf8c2159cfb0b61bca (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/application_setting_spec.rb')
| -rw-r--r-- | spec/models/application_setting_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb index 934e26a74fe..82ece6b2b91 100644 --- a/spec/models/application_setting_spec.rb +++ b/spec/models/application_setting_spec.rb @@ -380,6 +380,12 @@ describe ApplicationSetting do expect(subject).to be_invalid end + + it 'does not prevent from saving when gitaly timeouts were previously invalid' do + subject.update_column(:gitaly_timeout_default, Settings.gitlab.max_request_duration_seconds + 1) + + expect(subject.reload).to be_valid + end end describe 'enforcing terms' do |