diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
| commit | f8e9b0349b82278c8fb015037e901dd5a77e30e7 (patch) | |
| tree | c54eae2919f7d6a8532527ec4db7b33c26b71a71 /db/migrate/20140428133136_add_hidden_attrs_to_user.rb | |
| parent | 8abfaf4ce71dff7294424a7cb37efe4db5e0d581 (diff) | |
| parent | e08e007a6c50e1959a29a9d18dec8c52146a233c (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/_form.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'db/migrate/20140428133136_add_hidden_attrs_to_user.rb')
| -rw-r--r-- | db/migrate/20140428133136_add_hidden_attrs_to_user.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20140428133136_add_hidden_attrs_to_user.rb b/db/migrate/20140428133136_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140428133136_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 |