diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 21:08:07 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 21:08:07 -0500 |
commit | 11b6cab4a9a7d14e6b58c6a16f471aabaa42247f (patch) | |
tree | 2bfde1e22d5f93529cd2cf79b795fc8b574f72be /db/migrate/20140306014103_create_users.rb | |
parent | 0b9460c1af2619a6158141b01ba77836cc8a9e74 (diff) | |
parent | 0d710239a765787f10de304edc438de2dfaa9824 (diff) |
Merge branch 'clean'
Conflicts:
app/controllers/sessions_controller.rb
app/views/sessions/new.html.erb
config/routes.rb
Diffstat (limited to 'db/migrate/20140306014103_create_users.rb')
-rw-r--r-- | db/migrate/20140306014103_create_users.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/db/migrate/20140306014103_create_users.rb b/db/migrate/20140306014103_create_users.rb new file mode 100644 index 0000000..f0986d4 --- /dev/null +++ b/db/migrate/20140306014103_create_users.rb @@ -0,0 +1,11 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + end +end |