Merge remote-tracking branch 'upstream/pull/2432'

diff --git a/app/models/user.rb b/app/models/user.rb
index 1095dc6eaccbf9e4466d4b80bc6764d81f76371b..36ae0b55c9bf005274d8866231f50672a55dd1d8 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -46,6 +46,8 @@
 class User < ActiveRecord::Base
   require "xml/libxml"
 
+  self.ignored_columns = ["nearby"]
+
   has_many :traces, -> { where(:visible => true) }
   has_many :diary_entries, -> { order(:created_at => :desc) }
   has_many :diary_comments, -> { order(:created_at => :desc) }