diff options
author | azul <azul@riseup.net> | 2016-08-15 09:26:39 +0000 |
---|---|---|
committer | azul <azul@riseup.net> | 2016-08-15 09:26:39 +0000 |
commit | 1457fcdae08a1cd7e1e7b36668f826547d2c7cf6 (patch) | |
tree | 59b563bc3f10ed7d2438f6284f96478c592d3ddf /app/models/user.rb | |
parent | a1d62a3a1492ca21e1e1d2344fac88bb4d93f324 (diff) | |
parent | 75c037e5d6d8b8f2b98477bdd0359f5687bd7517 (diff) |
Merge branch 'test/gitlab-ci' into 'develop'
[ci] get gitlab to run tests
See merge request !2
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 93830cc..9cebbca 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,11 +1,10 @@ require 'login_format_validation' require 'local_email' +require 'temporary_user' class User < CouchRest::Model::Base include LoginFormatValidation - use_database :users - property :login, String, :accessible => true property :password_verifier, String, :accessible => true property :password_salt, String, :accessible => true |