mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 14:46:52 +09:00
Merge branch 'pr2462'
This commit is contained in:
commit
5c18104101
@ -42,7 +42,7 @@ class NotificationMailer < ApplicationMailer
|
||||
end
|
||||
|
||||
def reaction
|
||||
return unless @user.functional? && @status.present?
|
||||
return if @status.blank?
|
||||
|
||||
locale_for_account(@me) do
|
||||
mail subject: default_i18n_subject(name: @account.acct)
|
||||
|
@ -131,6 +131,7 @@ class InitialStateSerializer < ActiveModel::Serializer
|
||||
trends_as_landing_page: Setting.trends_as_landing_page,
|
||||
trends_enabled: Setting.trends,
|
||||
version: instance_presenter.version,
|
||||
visible_reactions: Setting.visible_reactions,
|
||||
}
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user