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

Conflicts:
	config/locales/en.yml
	db/schema.rb

db/migrate/20150519094929_add_aciton_to_registrant_verification.rb

@@ -0,0 +1,5 @@
+class AddAcitonToRegistrantVerification < ActiveRecord::Migration
+  def change
+    add_column :registrant_verifications, :action, :string
+  end
+end

db/migrate/20150519095416_add_domain_id_to_registrant_verifications.rb

@@ -0,0 +1,6 @@
+class AddDomainIdToRegistrantVerifications < ActiveRecord::Migration
+  def change
+    add_column :registrant_verifications, :domain_id, :integer
+    add_index :registrant_verifications, :domain_id
+  end
+end

db/migrate/20150519102521_add_action_type_to_registrant_verifications.rb

@@ -0,0 +1,5 @@
+class AddActionTypeToRegistrantVerifications < ActiveRecord::Migration
+  def change
+    add_column :registrant_verifications, :action_type, :string
+  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: 20150519140853) do
+ActiveRecord::Schema.define(version: 20150519102521) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -857,9 +857,13 @@ ActiveRecord::Schema.define(version: 20150519140853) do
     t.string   "verification_token"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "action"
+    t.integer  "domain_id"
+    t.string   "action_type"
   end
 
   add_index "registrant_verifications", ["created_at"], name: "index_registrant_verifications_on_created_at", using: :btree
+  add_index "registrant_verifications", ["domain_id"], name: "index_registrant_verifications_on_domain_id", using: :btree
 
   create_table "registrars", force: :cascade do |t|
     t.string   "name"