Merge remote-tracking branch 'origin/master' into gs-master

2017-11-28 11:45:13 -06:00
parent 7463d80ff4 15fab79cfa
commit 95c270f5b1
56 changed files with 867 additions and 77 deletions
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@ -18,7 +18,7 @@ class ProcessMentionsService < BaseService
      end

      if mentioned_account.nil?
-        username, domain  = match.first.split('@')
+        username, domain  = $1.split('@')
        mentioned_account = Account.find_remote(username, domain)
      end