diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-10-18 21:52:53 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-10-18 21:52:53 +0300 |
| commit | 7e72a6751fc954756f514396453042927766a785 (patch) | |
| tree | b0bf571e885791fb3bbd85bca8f06593a2e56b2b /app/models/application_setting.rb | |
| parent | 03106288f92ac5ec9c4867cc1be9b070f157ccac (diff) | |
| parent | 83b59da6549d3137f1424ee9bf16b95e4f72173e (diff) | |
Merge branch '10-1-stable-prepare-rc3' into '10-1-stable'
Prepare 10.1 RC3 release
See merge request gitlab-org/gitlab-ce!14921
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index c0cc60d5ebf..5b5bb3cbe2c 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -33,6 +33,8 @@ class ApplicationSetting < ActiveRecord::Base attr_accessor :domain_whitelist_raw, :domain_blacklist_raw + default_value_for :id, 1 + validates :uuid, presence: true validates :session_expire_delay, |