X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8750405bf7cc44ef53ea2387c5315925175de169..07feac3cd93d28cf3db4cc847b8289657db37094:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 6e9062a80..92fb3287b 100644 --- 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) } @@ -220,7 +218,7 @@ class User < ActiveRecord::Base end def is_friends_with?(new_friend) - friendships.where(:befriendee => new_friend).exists? + friendships.exists?(:befriendee => new_friend) end ##