Include the event type in the JSON output of a note

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 9a230898a87779160d1038cac73b1e0ef498b2a3..0c9e76d54999685bd920542c4daf0aa42d64cbf6 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -41,6 +41,9 @@ class User < ActiveRecord::Base
   validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
   validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
 
+  attr_accessible :display_name, :email, :email_confirmation, :openid_url,
+                  :pass_crypt, :pass_crypt_confirmation, :consider_pd
+
   after_initialize :set_creation_time
   before_save :encrypt_password