Merge branch 'master' into fix/notifications

Conflicts: app/views/notifications/index.html.haml
2026-05-18 05:29:31 -04:00 · 2019-07-17 09:24:04 +12:00
parent c8a721c304 e0dcd0226e
commit ac6ef384e0
1 changed files with 8 additions and 5 deletions
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -21,11 +21,14 @@
                %strong unread
              = n.created_at
          .col-6.col-md-3.text-right
-            = link_to n.sender do
-              %h3
-                /= render 'members/tiny', member: n.sender
-                = n.sender
-            = render 'members/follow_buttons', member: n.sender
+            - if n.sender.present?
+              = link_to n.sender do
+                %h3
+                  = render 'members/tiny', member: n.sender
+                  = n.sender
+              = render 'members/follow_buttons', member: n.sender
+            - else
+              Member deleted
      .card-footer
        = link_to 'Read', n, class: 'btn btn-primary'
        = link_to 'Reply', reply_link(n), class: 'btn btn-secondary'