tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb
This commit is contained in:
David Yip
2018-01-21 13:36:10 -06:00
parent 2c578a01d8 cfd2b06821
commit 1253279feb
9 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/notification_mailer/_status.html.haml
View File

@@ -19,7 +19,7 @@
%tbody
%tr
%td{ align: 'left', width: 48 }
= image_tag full_asset_url(status.account.avatar), alt:''
= image_tag full_asset_url(status.account.avatar.url), alt:''
%td{ align: 'left' }
%bdi= display_name(status.account)
= "@#{status.account.acct}"