Merge branch 'master' of github.com:LukeShu/leager

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb

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