Don't use ?: in "Comment from user" changeset discussion strings

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 441805f390e4c4a206aff7bb5bf23ba9bed41173..6b54182569415d58040cb738b6b93766ce93bcf1 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,7 +15,6 @@
 #  pass_salt            :string
 #  email_valid          :boolean          default(FALSE), not null
 #  new_email            :string
 #  pass_salt            :string
 #  email_valid          :boolean          default(FALSE), not null
 #  new_email            :string

-#  creation_ip          :string

 #  languages            :string
 #  status               :enum             default("pending"), not null
 #  terms_agreed         :datetime
 #  languages            :string
 #  status               :enum             default("pending"), not null
 #  terms_agreed         :datetime


@@ -50,6 +49,8 @@ class User < ApplicationRecord
   require "digest"
   include AASM
 
   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
   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