Fixing image upload limits, allowing webm, merge/unmerge events trigger

timeline reload in UI, other small fixes
2016-09-12 18:22:43 +02:00
parent 3d566279cb
commit ce29624c6d
15 changed files with 144 additions and 61 deletions
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@ -35,7 +35,7 @@ class Formatter
  def link_mentions(html, mentions)
    html.gsub(Account::MENTION_RE) do |match|
      acct    = Account::MENTION_RE.match(match)[1]
-      mention = mentions.find { |mention| mention.account.acct.eql?(acct) }
+      mention = mentions.find { |item| item.account.acct.eql?(acct) }

      mention.nil? ? match : mention_html(match, mention.account)
    end