diff options
| author | jessib <jessib@leap.se> | 2013-07-11 11:14:43 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-11 11:14:43 -0700 |
| commit | cc83a756affe1cedd6d828f038632b36e8afe95c (patch) | |
| tree | bf6d9255ee9709d1504832a61c8918e7ac5cc9bb /users/app/models/user.rb | |
| parent | 09b7f01cac6df1ae11f4129b20b781b78a3706ac (diff) | |
| parent | 02b69c78eed7682c24cb8361da094bdac45a7749 (diff) | |
Merge branch 'master' into feature/authentication_generic_error
Diffstat (limited to 'users/app/models/user.rb')
| -rw-r--r-- | users/app/models/user.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/users/app/models/user.rb b/users/app/models/user.rb index 3459520..413b4ac 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -11,6 +11,8 @@ class User < CouchRest::Model::Base property :public_key, :accessible => true + property :enabled, TrueClass, :default => true + validates :login, :password_salt, :password_verifier, :presence => true |