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

app/helpers/application_helper.rb

@@ -78,7 +78,7 @@ module ApplicationHelper
     output << "flavour-#{current_flavour.parameterize}"
     output << "skin-#{current_skin.parameterize}"
     output << 'system-font' if current_account&.user&.setting_system_font_ui
-    output << current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion'
+    output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion')
     output << 'rtl' if locale_direction == 'rtl'
     output.reject(&:blank?).join(' ')
   end

app/views/accounts/_bio.html.haml

@@ -3,7 +3,7 @@
     .account__header__fields
       - account.fields.each do |field|
         %dl
-          %dt.emojify{ title: field.name }= field.name
+          %dt.emojify{ title: field.name }= Formatter.instance.format_field(account, field.name, custom_emojify: true)
           %dd.emojify{ title: field.value }= Formatter.instance.format_field(account, field.value, custom_emojify: true)
 
   = account_badge(account)