Merge branch 'master' into glitch-soc/merge-upstream

2019-03-20 17:32:39 +01:00
parent 803c350ef5 80f0910e21
commit cbf1d711ba
11 changed files with 50 additions and 12 deletions
@@ -71,6 +71,12 @@ class Formatter
    html.html_safe # rubocop:disable Rails/OutputSafety
  end

+  def format_poll_option(status, option, **options)
+    html = encode(option.title)
+    html = encode_custom_emojis(html, status.emojis, options[:autoplay])
+    html.html_safe # rubocop:disable Rails/OutputSafety
+  end
+
  def format_display_name(account, **options)
    html = encode(account.display_name.presence || account.username)
    html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]