From c156a83e7d4458355e7ab60ee118ca8c09b80ece Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Sun, 4 Feb 2018 20:31:46 +0900
Subject: [PATCH] Make sure status is not nil (#6428)
---
app/mailers/notification_mailer.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 9fed4a6369..b458442962 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -9,7 +9,7 @@ class NotificationMailer < ApplicationMailer
@me = recipient
@status = notification.target_status
- return if @me.user.disabled?
+ return if @me.user.disabled? || @status.nil?
locale_for_account(@me) do
thread_by_conversation(@status.conversation)
@@ -33,7 +33,7 @@ class NotificationMailer < ApplicationMailer
@account = notification.from_account
@status = notification.target_status
- return if @me.user.disabled?
+ return if @me.user.disabled? || @status.nil?
locale_for_account(@me) do
thread_by_conversation(@status.conversation)
@@ -46,7 +46,7 @@ class NotificationMailer < ApplicationMailer
@account = notification.from_account
@status = notification.target_status
- return if @me.user.disabled?
+ return if @me.user.disabled? || @status.nil?
locale_for_account(@me) do
thread_by_conversation(@status.conversation)
--
GitLab