Revert "Contrain user uniqueness in model, not DB, to accomodate conc…

…erto-identities" Aside from being from my misconfigured Mac, this commit should wait for some work on the identities table. This reverts commit 6944454.
concerto · Apr 7, 2015 · d9bbc30 · d9bbc30
1 parent c2f101d
commit d9bbc30
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -27,7 +27,6 @@ class User < ActiveRecord::Base
 
   # Validations
   validates :first_name, presence: true
-  validates :email, uniqueness: true
 
   scope :admin, -> { where is_admin: true }
 

diff --git a/db/migrate/20150407003944_set_unique_email_in_model.rb b/db/migrate/20150407003944_set_unique_email_in_model.rb
diff --git a/db/schema.rb b/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: 20150407003944) do
+ActiveRecord::Schema.define(version: 20140804171558) do
 
   create_table "activities", force: true do |t|
     t.integer  "trackable_id"
@@ -256,7 +256,7 @@
     t.string   "unconfirmed_email"
   end
 
-  add_index "users", ["email"], name: "index_users_on_email"
+  add_index "users", ["email"], name: "index_users_on_email", unique: true
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
 
 end