diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-24 12:06:22 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-24 12:06:31 +0100 |
| commit | acde8a57e087d3058b8539e04c12e790866f8451 (patch) | |
| tree | d972b799c89eb5be11cfee3c93cf5bd36956c741 /app/models/user.rb | |
| parent | bd1dede2591fd9c4ebc54e5ef41232193f0a0f5b (diff) | |
| parent | 774c199fa52b98b6780928a602dfdee1b2fce711 (diff) | |
Merge branch 'feature/report-request-as-unsuitable' into develop. Fixes #445
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 4a7153b3f..57fce429c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 108 +# Schema version: 114 # # Table name: users # @@ -20,6 +20,8 @@ # email_bounced_at :datetime # email_bounce_message :text default(""), not null # no_limit :boolean default(FALSE), not null +# receive_email_alerts :boolean default(TRUE), not null +# user_similarity_id :integer # # models/user.rb: @@ -441,3 +443,4 @@ class User < ActiveRecord::Base end end + |