summaryrefslogtreecommitdiff
path: root/users/app/models/user.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-01-25 19:26:51 +0100
committerAzul <azul@leap.se>2013-01-25 19:26:51 +0100
commit9563ed191556e739c8f99be4d0fc75ac31c8f6cd (patch)
tree5a87fc1947921766a5430896f4bcf531dc396bff /users/app/models/user.rb
parent77a51e1de520299afd2b33e7a3992aaafab1d6ae (diff)
parentdac578781baf73a006cc78e29588dd1f6fdc0fd3 (diff)
Merge branch 'master' into merge_leap_ca
Diffstat (limited to 'users/app/models/user.rb')
-rw-r--r--users/app/models/user.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 292fb13..80d49a3 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -9,6 +9,8 @@ class User < CouchRest::Model::Base
property :email_forward, String, :accessible => true
property :email_aliases, [LocalEmail]
+ property :public_key, :accessible => true
+
validates :login, :password_salt, :password_verifier,
:presence => true