diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:52:39 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:52:39 -0500 |
commit | acb5be88f394b126c3fba48ceb9798403c5afae1 (patch) | |
tree | d28ba5b07bc91cb92f02c9e490bff5501859e6fd /db | |
parent | 9f246b9ec386ccb5e6665408d050cf71fc336283 (diff) | |
parent | ec9b2d4f40bd6a878aeca3ca32ba2aafe3836da5 (diff) |
Merge branch 'master' of github.com:LukeShu/leager
Conflicts:
app/controllers/users_controller.rb
app/views/users/index.html.erb
Diffstat (limited to 'db')
-rw-r--r-- | db/schema.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index 1f844f5..494fb09 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -116,6 +116,12 @@ ActiveRecord::Schema.define(version: 20140304043700) do t.string "user_name" t.datetime "created_at" t.datetime "updated_at" + t.string "password_digest" + t.string "remember_token" end + add_index "users", ["email"], name: "index_users_on_email", unique: true + add_index "users", ["remember_token"], name: "index_users_on_remember_token" + add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true + end |