X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e8029e2aff07fc67d369b19b414b6f6550f3ed23..b3f8d9435a30f43b969bb8e3bfcc2386ef0aa4a7:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 6b5418256..d8e8771d8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -49,8 +49,6 @@ class User < ApplicationRecord
   require "digest"
   include AASM
 
-  self.ignored_columns += ["creation_ip"]
-
   has_many :traces, -> { where(:visible => true) }
   has_many :diary_entries, -> { order(:created_at => :desc) }, :inverse_of => :user
   has_many :diary_comments, -> { order(:created_at => :desc) }, :inverse_of => :user
@@ -68,6 +66,8 @@ class User < ApplicationRecord
   has_and_belongs_to_many :changeset_subscriptions, :class_name => "Changeset", :join_table => "changesets_subscribers", :foreign_key => "subscriber_id"
   has_many :note_comments, :foreign_key => :author_id, :inverse_of => :author
   has_many :notes, :through => :note_comments
+  has_many :note_subscriptions, :class_name => "NoteSubscription"
+  has_many :subscribed_notes, :through => :note_subscriptions, :source => :note
 
   has_many :oauth2_applications, :class_name => Doorkeeper.config.application_model.name, :as => :owner
   has_many :access_grants, :class_name => Doorkeeper.config.access_grant_model.name, :foreign_key => :resource_owner_id