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

2019-08-12 16:24:22 +02:00
parent aa485d6f05 74111bbb1c
commit c4ae7aab6f
24 changed files with 214 additions and 120 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -508,7 +508,7 @@ class Account < ApplicationRecord
  end

  def emojifiable_text
-    [note, display_name, fields.map(&:value)].join(' ')
+    [note, display_name, fields.map(&:name), fields.map(&:value)].join(' ')
  end

  def clean_feed_manager