summaryrefslogtreecommitdiff
path: root/users/app/models
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-04-08 11:04:01 -0700
committerjessib <jessib@riseup.net>2013-04-08 11:04:01 -0700
commit176845b45f6982b0bf26aa69e7432562eed97c69 (patch)
tree1dd74d5afcdb8cfb96588937eda612b37449923c /users/app/models
parent602229c463c58be9ffb909570155d14d59f6b4d5 (diff)
parent654ab25fa4659119d5ddaa9ae116fce69a386ab1 (diff)
Merge pull request #41 from azul/feature/allow-getting-salt
Allow getting salt and proper error messages for invalid login attempts
Diffstat (limited to 'users/app/models')
-rw-r--r--users/app/models/user.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index c9b367f..62c5054 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -47,7 +47,8 @@ class User < CouchRest::Model::Base
timestamps!
design do
- load_views(Rails.root.join('users', 'app', 'designs', 'user'))
+ own_path = Pathname.new(File.dirname(__FILE__))
+ load_views(own_path.join('..', 'designs', 'user'))
view :by_login
view :by_created_at
end