diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
| commit | c93c9f837c09ba0385690fb1a228a9c506ca120c (patch) | |
| tree | 19f115b0bc62fefc45f9c25ec4beeefee6429c8b /db/migrate/20140424005552_add_hidden_attrs_to_user.rb | |
| parent | 9003a9099719a771fbbb9d2e8a4bfb093f35929a (diff) | |
| parent | 933199499f9adfa0347783c538a10b88ffb1b98b (diff) | |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
Diffstat (limited to 'db/migrate/20140424005552_add_hidden_attrs_to_user.rb')
| -rw-r--r-- | db/migrate/20140424005552_add_hidden_attrs_to_user.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20140424005552_add_hidden_attrs_to_user.rb b/db/migrate/20140424005552_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140424005552_add_hidden_attrs_to_user.rb @@ -0,0 +1,6 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :permissions, :integer + end +end |