Commit d464d790 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre
Browse files

Lazily sets UUID in ApplicationSetting for new installations

parent 4b58d05ada5b
......@@ -28,6 +28,8 @@ class ApplicationSetting < ActiveRecord::Base
attr_accessor :domain_whitelist_raw, :domain_blacklist_raw
validates :uuid, presence: true
validates :session_expire_delay,
presence: true,
numericality: { only_integer: true, greater_than_or_equal_to: 0 }
......@@ -159,6 +161,7 @@ class ApplicationSetting < ActiveRecord::Base
end
end
before_validation :ensure_uuid!
before_save :ensure_runners_registration_token
before_save :ensure_health_check_access_token
......@@ -344,6 +347,12 @@ def sidekiq_throttling_enabled?
private
def ensure_uuid!
return if uuid?
self.uuid = SecureRandom.uuid
end
def check_repository_storages
invalid = repository_storages - Gitlab.config.repositories.storages.keys
errors.add(:repository_storages, "can't include: #{invalid.join(", ")}") unless
......
......@@ -4,6 +4,7 @@
let(:setting) { ApplicationSetting.create_from_defaults }
it { expect(setting).to be_valid }
it { expect(setting.uuid).to be_present }
describe 'validations' do
let(:http) { 'http://example.com' }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment