diff options
| author | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
| commit | e1a004e2b24c2c235452469abfefa033e24435b2 (patch) | |
| tree | a4b1c89a5aa4d5ccb3c17521499c999dedd5842d /users/app/models | |
| parent | 4793c2b770fcb018303b7ab226b75cc218364327 (diff) | |
| parent | 8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (diff) | |
Merge branch 'master' into help_develop
Conflicts:
app/views/layouts/application.html.haml
help/app/controllers/tickets_controller.rb
help/test/functional/tickets_controller_test.rb
users/test/support/stub_record_helper.rb
Diffstat (limited to 'users/app/models')
| -rw-r--r-- | users/app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/users/app/models/user.rb b/users/app/models/user.rb index 325c981..ae271ce 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -2,6 +2,7 @@ class User < CouchRest::Model::Base property :login, String, :accessible => true property :email, String, :accessible => true + property :email_forward, String, :accessible => true property :password_verifier, String, :accessible => true property :password_salt, String, :accessible => true |