diff options
author | jessib <jessib@riseup.net> | 2012-10-29 11:18:51 -0700 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2012-10-29 11:18:51 -0700 |
commit | 2de76b40a926985fce186c8ba18450d310ed4fa3 (patch) | |
tree | 89644aaeb9d20ae819819f211de5f5f8cf0dd8e8 /users/app/models | |
parent | 3ba2e664a26e96a93c8640b57241af6386db361e (diff) | |
parent | 8b9d5235faed6c15e8ef2e2dc76aec7f24d0bb50 (diff) |
Merge branch 'help_develop' into develop
Diffstat (limited to 'users/app/models')
-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 1afb9db..29c0b38 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -63,11 +63,13 @@ class User < CouchRest::Model::Base login end +=begin def self.current Thread.current[:user] end def self.current=(user) Thread.current[:user] = user end +=end end |