Removed accidental n+1 query from notifications, updated some deps,

improved how "show more" link looks
2017-01-26 14:52:07 +01:00
parent 2f18c77e44
commit cc5c1e5feb
7 changed files with 36 additions and 25 deletions
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@ -66,6 +66,8 @@ class Notification < ApplicationRecord
  private

  def set_from_account
+    return unless new_record?
+
    case activity_type
    when 'Status', 'Follow', 'Favourite', 'FollowRequest'
      self.from_account_id = activity(false)&.account_id