Merge branch 'gorone-xyz' into gorone-xyz-v2.7.0

shijimi999 · Jan 20, 2019 · 1abde9f · 1abde9f
2 parents f9157e3 + 6843b88
commit 1abde9f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
@@ -150,7 +150,6 @@ class StatusActionBar extends ImmutablePureComponent {
 
     let menu = [];
     let reblogIcon = 'retweet';
-    let replyIcon;
     let replyTitle;
 
     menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
@@ -198,10 +197,8 @@ class StatusActionBar extends ImmutablePureComponent {
     }
 
     if (status.get('in_reply_to_id', null) === null) {
-      replyIcon = 'reply';
       replyTitle = intl.formatMessage(messages.reply);
     } else {
-      replyIcon = 'reply-all';
       replyTitle = intl.formatMessage(messages.replyAll);
     }
 

diff --git a/app/models/notification.rb b/app/models/notification.rb
@@ -76,7 +76,6 @@ def reload_stale_associations!(cached_items)
       return if account_ids.empty?
 
       accounts = Account.where(id: account_ids).includes(:account_stat).each_with_object({}) { |a, h| h[a.id] = a }
-
       cached_items.each do |item|
         item.from_account = accounts[item.from_account_id]
         item.target_status.account = accounts[item.target_status.account_id] if item.target_status