Merge remote-tracking branch 'parent/main' into upstream-20241006
This commit is contained in:
commit
66bed31dbe
226 changed files with 2688 additions and 1846 deletions
|
@ -86,7 +86,7 @@ class NotificationMailer < ApplicationMailer
|
|||
end
|
||||
|
||||
def thread_by_conversation!
|
||||
return if @status.conversation.nil?
|
||||
return if @status&.conversation.nil?
|
||||
|
||||
conversation_message_id = "<conversation-#{@status.conversation.id}.#{@status.conversation.created_at.to_date}@#{Rails.configuration.x.local_domain}>"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue