Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream

2017-09-28 09:18:35 +02:00
parent fcf0d2078e b9f59ebcc6
commit 83bda6c1a8
4750 changed files with 5257 additions and 3475 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -52,7 +52,6 @@ class Account < ApplicationRecord
  include AccountInteractions
  include Attachmentable
  include Remotable
-  include EmojiHelper

  MAX_NOTE_LENGTH = 500

@ -271,9 +270,6 @@ class Account < ApplicationRecord
  def prepare_contents
    display_name&.strip!
    note&.strip!
-
-    self.display_name = emojify(display_name)
-    self.note         = emojify(note)
  end

  def generate_keys