mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-11-27 06:18:53 +09:00
Code

Merge branch 'pr2462'

Browse Source
This commit is contained in:
Noa Himesaka 2024-11-11 13:46:02 +09:00
commit 5c18104101
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/notification_mailer.rb
View File

@ -42,7 +42,7 @@ class NotificationMailer < ApplicationMailer
end end
def reaction def reaction
return unless @user.functional? && @status.present? return if @status.blank?
locale_for_account(@me) do locale_for_account(@me) do
mail subject: default_i18n_subject(name: @account.acct) mail subject: default_i18n_subject(name: @account.acct)

1
app/serializers/initial_state_serializer.rb
View File

@ -131,6 +131,7 @@ class InitialStateSerializer < ActiveModel::Serializer
trends_as_landing_page: Setting.trends_as_landing_page, trends_as_landing_page: Setting.trends_as_landing_page,
trends_enabled: Setting.trends, trends_enabled: Setting.trends,
version: instance_presenter.version, version: instance_presenter.version,
visible_reactions: Setting.visible_reactions,
} }
end end