summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-08-12 11:34:01 +0200
committerAzul <azul@riseup.net>2016-08-12 12:20:54 +0200
commitb4ff3b959d4dd6a7561ac3be063a43619c0bd89c (patch)
tree4cd4dc871ca9938f93357283641c0cb79b3741be
parentbef746ae7b215db78be088657bbfaf47c774f943 (diff)
move temporary_user into lib - fix load issue
We already did the same for other concerns. The way we load models for couchrest migrations does not work well with concerns in the model directory as they will be loaded twice.
-rw-r--r--app/models/user.rb1
-rw-r--r--lib/temporary_user.rb (renamed from app/models/temporary_user.rb)0
2 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 93830cc..1116e6c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,6 @@
require 'login_format_validation'
require 'local_email'
+require 'temporary_user'
class User < CouchRest::Model::Base
include LoginFormatValidation
diff --git a/app/models/temporary_user.rb b/lib/temporary_user.rb
index 2afae15..2afae15 100644
--- a/app/models/temporary_user.rb
+++ b/lib/temporary_user.rb