diff options
| author | DeAndre Harris <dharris@gitlab.com> | 2019-07-29 09:45:20 +0000 |
|---|---|---|
| committer | DeAndre Harris <dharris@gitlab.com> | 2019-07-29 09:45:20 +0000 |
| commit | 88b4b9bd2e8224e17ff089d2a8ea99f800686b70 (patch) | |
| tree | 67e6fadf31d75860f2158c05168f160d52ae46fe /app/models/application_setting.rb | |
| parent | 750fd7374ae67bb6ed4d9d875052bbc6d86d9b31 (diff) | |
| parent | 77926ea02512d836c61a30e3986902e2d8e7f886 (diff) | |
| download | gitlab-ce-docs-troubleshoot-scim.tar.gz | |
Merge branch 'master' into 'docs-troubleshoot-scim'docs-troubleshoot-scim
# Conflicts:
# doc/user/group/saml_sso/scim_setup.md
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 8e558487c1c..a769a8f07fd 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -41,6 +41,11 @@ class ApplicationSetting < ApplicationRecord validates :uuid, presence: true + validates :outbound_local_requests_whitelist, + length: { maximum: 1_000, message: N_('is too long (maximum is 1000 entries)') } + + validates :outbound_local_requests_whitelist, qualified_domain_array: true, allow_blank: true + validates :session_expire_delay, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } |