Merge branch 'ee-2246-uuid-is-nil-for-new-installation' into 'master'

Port of 2246-uuid-is-nil-for-new-installation to EE

See merge request !1733

app/models/application_setting.rb

@@ -29,6 +29,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 }
@@ -176,6 +178,7 @@ class ApplicationSetting < ActiveRecord::Base
     end
   end
 
+  before_validation :ensure_uuid!
   before_save :ensure_runners_registration_token
   before_save :ensure_health_check_access_token
 
@@ -402,6 +405,12 @@ class ApplicationSetting < ActiveRecord::Base
 
   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

changelogs/unreleased/2246-uuid-is-nil-for-new-installation.yml

+---
+title: Lazily sets UUID in ApplicationSetting for new installations
+merge_request:
+author:

db/migrate/20170426175636_fill_missing_uuid_on_application_settings.rb

+class FillMissingUuidOnApplicationSettings < ActiveRecord::Migration
+  DOWNTIME = false
+
+  def up
+    execute("UPDATE application_settings SET uuid = #{quote(SecureRandom.uuid)} WHERE uuid is NULL")
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170424142900) do
+ActiveRecord::Schema.define(version: 20170426175636) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1624,4 +1624,4 @@ ActiveRecord::Schema.define(version: 20170424142900) do
   add_foreign_key "timelogs", "merge_requests", name: "fk_timelogs_merge_requests_merge_request_id", on_delete: :cascade
   add_foreign_key "trending_projects", "projects", on_delete: :cascade
   add_foreign_key "u2f_registrations", "users"
-end
+end
\ No newline at end of file

spec/models/application_setting_spec.rb

@@ -4,6 +4,7 @@ describe ApplicationSetting, models: true do
   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' }