Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
timeline reload in UI, other small fixes
This commit is contained in:
Eugen Rochko 2016-09-12 18:22:43 +02:00
parent 3d566279cb
commit ce29624c6d
15 changed files with 144 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/formatter.rb
View file

@ -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