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

Merge branch 'master' into glitch-soc/master

Browse Source 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
This commit is contained in:
Thibaut Girka
2018-05-09 17:43:30 +02:00
parent 143878d9da ac788ad47e
commit 1c9c0167b7
145 changed files with 3052 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/reports/_account.html.haml
View File

@@ -15,5 +15,5 @@
.account__avatar{ style: "background-image: url(#{account.avatar.url}); width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px" }
%span.display-name
%bdi
%strong.display-name__html.emojify= display_name(account)
%strong.display-name__html.emojify= display_name(account, custom_emojify: true)
%span.display-name__account @#{account.acct}

2
app/views/admin/reports/_status.html.haml
View File

@@ -7,7 +7,7 @@
%p><
%strong= Formatter.instance.format_spoiler(status)
= Formatter.instance.format(status)
= Formatter.instance.format(status, custom_emojify: true)
- unless status.media_attachments.empty?
- if status.media_attachments.first.video?