diff options
| author | Seb Bacon <seb@mysociety.org> | 2012-01-09 12:25:18 +0000 |
|---|---|---|
| committer | Seb Bacon <seb@mysociety.org> | 2012-01-09 12:25:18 +0000 |
| commit | ea0b9a5d28b9d5fb94f141b100e185f8f1447453 (patch) | |
| tree | a7bc52771702e824ef20d95ac967c13c9c2537a5 /app/models/user.rb | |
| parent | dff8433fcba0c5c1fdc040f705162f95162124e5 (diff) | |
| parent | 4e61749bf5103ee5e7d1a6348273281f08d1a6f3 (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index e98d777b1..b6839aa31 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 95 +# Schema version: 108 # # Table name: users # @@ -10,13 +10,14 @@ # salt :string(255) not null # created_at :datetime not null # updated_at :datetime not null -# email_confirmed :boolean default(false), not null +# email_confirmed :boolean default(FALSE), not null # url_name :text not null # last_daily_track_email :datetime default(Sat Jan 01 00:00:00 UTC 2000) # admin_level :string(255) default("none"), not null # ban_text :text default(""), not null # about_me :text default(""), not null -# email_bounced_at :datetime +# locale :string(255) +# email_bounced_at :datetime # email_bounce_message :text default(""), not null # |