diff options
author | ThibG <thib@sitedethib.com> | 2019-12-08 21:27:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-08 21:27:36 +0100 |
commit | 246addd5b33a172600342af3fb6fb5e4c80ad95e (patch) | |
tree | 98b87efd3f5f3d41d75482707924fde708c074ec /app/services/notify_service.rb | |
parent | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (diff) | |
parent | 49027ee948bc76cc89214f8f340d353763796f1d (diff) |
Merge pull request #1251 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/notify_service.rb')
-rw-r--r-- | app/services/notify_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index b5c721589..9364a6ae8 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -9,7 +9,7 @@ class NotifyService < BaseService return if recipient.user.nil? || blocked? create_notification! - push_notification! if @notification.browserable? + push_notification! push_to_conversation! if direct_message? send_email! if email_enabled? rescue ActiveRecord::RecordInvalid |