From: Tom Hughes <tom@compton.nu>
Date: Thu, 14 Nov 2019 12:20:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2432'
X-Git-Tag: live~2523
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/38b464a2387d8b4303f3f6749d3aa61856023dd4?hp=80238df3cad5817bfea58cfe887faa415f911ae5

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 1095dc6ea..36ae0b55c 100644
--- 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) }