Merge branch 'master' into fix-3278

2017-12-13 14:30:08 -08:00
parent 1c5c3b5f9f 8d5f1bccaf
commit 5da62eff8d
27 changed files with 312 additions and 79 deletions
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -182,8 +182,8 @@ class Comment < ApplicationRecord
  end

  def initialize_updater
-    self.updater_id ||= CurrentUser.user.id
-    self.updater_ip_addr ||= CurrentUser.ip_addr
+    self.updater_id = CurrentUser.user.id
+    self.updater_ip_addr = CurrentUser.ip_addr
  end

  def creator_name