diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 23:28:43 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 23:28:43 +0300 |
| commit | a2f375e8f74870dcdcfa1c7886bd1c14c80a684e (patch) | |
| tree | 6b6e3a4f7554f4671edc17d87869dd6916984404 /app/models/member.rb | |
| parent | a22f6fa6e50bb31921415b01fd345d6802581390 (diff) | |
| parent | 81852d1f902c2923c239e9c33cab77f5fd6ca8d8 (diff) | |
Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-backport
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index c47145667b5..2d17795e62d 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -314,7 +314,7 @@ class Member < ActiveRecord::Base end def notification_setting - @notification_setting ||= user.notification_settings_for(source) + @notification_setting ||= user&.notification_settings_for(source) end def notifiable?(type, opts = {}) |