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

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 6e9062a801f8f41d18e8c9cca100f59a51d1d05f..518cb94ccf29a81223671520c23dd09d5c467d1d 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -43,11 +43,9 @@
 #  users_home_idx                (home_tile)
 #
 
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   require "xml/libxml"
 
-  self.ignored_columns = %w[image_file_name image_fingerprint image_content_type]
-
   has_many :traces, -> { where(:visible => true) }
   has_many :diary_entries, -> { order(:created_at => :desc) }
   has_many :diary_comments, -> { order(:created_at => :desc) }