summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2017-08-01 11:42:24 -0700
committerhttp://jneen.net/ <jneen@jneen.net>2017-08-03 09:07:18 -0700
commit444c8584491ce0efe2314747326da6ab7d17490c (patch)
treed1147b853ffb096e6340736f509e13aa49d9546b /app
parentc2dd4239c939e003dfe569196ec2d39e2478606e (diff)
downloadgitlab-ce-444c8584491ce0efe2314747326da6ab7d17490c.tar.gz
use safe navigation on notification_setting
Diffstat (limited to 'app')
-rw-r--r--app/models/notification_recipient.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/notification_recipient.rb b/app/models/notification_recipient.rb
index 837b62ec0cb..a14254178e1 100644
--- a/app/models/notification_recipient.rb
+++ b/app/models/notification_recipient.rb
@@ -31,7 +31,7 @@ class NotificationRecipient
@notification_level ||=
case raw_notification_level
when :custom
- if @custom_action && notification_setting.event_enabled?(@custom_action)
+ if @custom_action && notification_setting&.event_enabled?(@custom_action)
:watch
else
:custom