diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:18:35 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:18:35 +0200 |
| commit | 83bda6c1a813c5aeb131b18a0500fed0c07fa9c2 (patch) | |
| tree | 32f197901b4b16ea7f94de682fee6cdc44686045 /app/models/account.rb | |
| parent | fcf0d2078ea813e0dd318fa154d620018e7b7bcf (diff) | |
| parent | b9f59ebcc68e9da0a7158741a1a2ef3564e1321e (diff) | |
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 1b996e3cc..de7998db4 100644 --- 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 |