Merge branch 'master' of github.com:internetee/registry

Conflicts:
	db/schema.rb

db/migrate/20141124105221_remove_address_type_from_contact_disclosure.rb

@@ -0,0 +1,14 @@
+class RemoveAddressTypeFromContactDisclosure < ActiveRecord::Migration
+  def change
+    remove_column :contact_disclosures, :int_name, :boolean
+    remove_column :contact_disclosures, :int_org_name, :boolean
+    remove_column :contact_disclosures, :int_addr, :boolean
+    remove_column :contact_disclosures, :loc_name, :boolean
+    remove_column :contact_disclosures, :loc_org_name, :boolean
+    remove_column :contact_disclosures, :loc_addr, :boolean
+
+    add_column :contact_disclosures, :name, :boolean
+    add_column :contact_disclosures, :org_name, :boolean
+    add_column :contact_disclosures, :address, :boolean
+  end
+end

db/migrate/20141127091027_remove_defaults_from_disclosure.rb

@@ -0,0 +1,7 @@
+class RemoveDefaultsFromDisclosure < ActiveRecord::Migration
+  def change
+    change_column :contact_disclosures, :phone, :boolean, :default => nil
+    change_column :contact_disclosures, :fax, :boolean, :default => nil
+    change_column :contact_disclosures, :email, :boolean, :default => nil
+  end
+end

db/schema.rb

@@ -49,17 +49,14 @@ ActiveRecord::Schema.define(version: 20141202114457) do
 
   create_table "contact_disclosures", force: true do |t|
     t.integer  "contact_id"
-    t.boolean  "int_name",     default: false
-    t.boolean  "int_org_name", default: false
-    t.boolean  "int_addr",     default: false
-    t.boolean  "loc_name",     default: false
-    t.boolean  "loc_org_name", default: false
-    t.boolean  "loc_addr",     default: false
-    t.boolean  "phone",        default: false
-    t.boolean  "fax",          default: false
-    t.boolean  "email",        default: false
+    t.boolean  "phone"
+    t.boolean  "fax"
+    t.boolean  "email"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "name"
+    t.boolean  "org_name"
+    t.boolean  "address"
   end
 
   create_table "contact_versions", force: true do |t|