Mercurial > hg > soundsoftware-site

diff app/models/user_preference.rb @ 931:ec1c49528f36 cannam_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "redmine-1.3"
author Chris Cannam
date Wed, 27 Jun 2012 15:04:58 +0100
parents 5f33065ddc4b
children 433d4f72a19b
line wrap: on
line diff
--- a/app/models/user_preference.rb	Wed Jun 27 14:56:14 2012 +0100
+++ b/app/models/user_preference.rb	Wed Jun 27 15:04:58 2012 +0100
@@ -19,7 +19,7 @@
   belongs_to :user
   serialize :others
 
-  attr_protected :others
+  attr_protected :others, :user_id
 
   def initialize(attributes = nil)
     super