From 246951bba7965f4257aa50377a981f3c85c67f1e Mon Sep 17 00:00:00 2001 From: "http://jneen.net/" Date: Tue, 1 Aug 2017 11:52:43 -0700 Subject: [PATCH] unmemoize read_ability since it's only called once now in make_recipient --- app/services/notification_recipient_service.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/services/notification_recipient_service.rb b/app/services/notification_recipient_service.rb index b2d805e9f27..97ff1f99f02 100644 --- a/app/services/notification_recipient_service.rb +++ b/app/services/notification_recipient_service.rb @@ -87,13 +87,12 @@ module NotificationRecipientService end def read_ability - @read_ability ||= - case target - when Issuable - :"read_#{target.to_ability_name}" - when Ci::Pipeline - :read_build # We have build trace in pipeline emails - end + case target + when Issuable + :"read_#{target.to_ability_name}" + when Ci::Pipeline + :read_build # We have build trace in pipeline emails + end end def custom_action @@ -308,7 +307,9 @@ module NotificationRecipientService end def read_ability - @read_ability ||= :"read_#{target.class.model_name.name.underscore}" + return nil if target.nil? + + :"read_#{target.class.model_name.name.underscore}" end def build!