From 8e6dfe7166c2d69b614c8d4352a7933f5e349d95 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Sun, 8 Aug 2010 17:00:39 -0700
Subject: [PATCH] DG IZ having an email key makes devise work, ring to deploy

---
 app/models/user.rb                      | 2 +-
 app/views/layouts/application.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 243f34a11..8b51c20dd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -16,7 +16,7 @@ class User
   before_validation :do_bad_things
   
   ######## Posting ########
-  delegate :email, :email=, :to => :person
+  key :email, String
 
   def method_missing(method, *args)
     self.person.send(method, *args)
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 7d069eeec..4eb0281a4 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -18,7 +18,7 @@
     = csrf_meta_tag
     = yield(:head)
 
-    = javascript_include_tag 'satisfaction' , 'satisfaction-display'
+    /= javascript_include_tag 'satisfaction' , 'satisfaction-display'
 
     = javascript_include_tag 'jquery.html5_upload'