Merge remote-tracking branch 'parent/main' into upstream-20240310

2025-03-10 19:58:05 +09:00 · 2025-03-10 19:58:05 +09:00 · 5979c0ea1d
commit 5979c0ea1d
parent 69d5383d1f 207029eb2f
345 changed files with 4304 additions and 2540 deletions
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@ -219,6 +219,15 @@ class UserMailer < Devise::Mailer
    end
  end

+  def announcement_published(user, announcement)
+    @resource = user
+    @announcement = announcement
+
+    I18n.with_locale(locale) do
+      mail subject: default_i18n_subject
+    end
+  end
+
  private

  def default_devise_subject