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

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

Browse Source 
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml
This commit is contained in:
David Yip
2018-04-01 20:24:50 -05:00
parent f0bb3ff533 f890d2a766
commit eb39db7f93
82 changed files with 753 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/accounts/_header.html.haml
View File

@ -1,4 +1,4 @@
- processed_bio = FrontmatterHandler.instance.process_bio Formatter.instance.simplified_format account
- processed_bio = FrontmatterHandler.instance.process_bio Formatter.instance.simplified_format(account, custom_emojify: true)
.card.h-card.p-author{ style: "background-image: url(#{account.header.url(:original)})" }
.card__illustration
= render 'accounts/follow_button', account: account