Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
2018-04-01 20:24:50 -05:00
parent f0bb3ff533 f890d2a766
commit eb39db7f93
82 changed files with 753 additions and 37 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -352,6 +352,10 @@ class Account < ApplicationRecord
    end
  end

+  def emojis
+    CustomEmoji.from_text(note, domain)
+  end
+
  before_create :generate_keys
  before_validation :normalize_domain
  before_validation :prepare_contents, if: :local?