about summary refs log tree commit diff
path: root/app/views/admin/reports
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-09 17:43:30 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-10 00:03:28 +0200
commit1c9c0167b7ea7dd03ef233a085adc0a6ef1b2527 (patch)
treeccfcb53c4ddb61d7ef3158d29403ff7cd6516e55 /app/views/admin/reports
parent143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff)
parentac788ad47e32a3cf84a46ac87f84f376185cdad4 (diff)
Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
Diffstat (limited to 'app/views/admin/reports')
-rw-r--r--app/views/admin/reports/_account.html.haml2
-rw-r--r--app/views/admin/reports/_status.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/reports/_account.html.haml b/app/views/admin/reports/_account.html.haml
index 22b7a0861..9ac161c9c 100644
--- a/app/views/admin/reports/_account.html.haml
+++ b/app/views/admin/reports/_account.html.haml
@@ -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}
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index 137609539..9057e6048 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -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?