Skip to content

Commit

Permalink
Fix Rails 5 deprecation
Browse files Browse the repository at this point in the history
  • Loading branch information
David Rodríguez authored and tapn2it committed Dec 19, 2016
1 parent 3c9b936 commit 5ce88f3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/models/mailboxer/conversation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Mailboxer::Conversation < ActiveRecord::Base
joins("INNER JOIN (#{Mailboxer::Notification.recipient(participant_two).to_sql}) participant_two_notifications ON participant_two_notifications.conversation_id = mailboxer_conversations.id AND participant_two_notifications.type IN ('Mailboxer::Message')").
joins("INNER JOIN mailboxer_receipts ON mailboxer_receipts.notification_id = participant_two_notifications.id").
merge(Mailboxer::Receipt.recipient(participant_one)).
order("mailboxer_conversations.updated_at DESC").uniq
order("mailboxer_conversations.updated_at DESC").distinct
}

#Mark the conversation as read for one of the participants
Expand Down

0 comments on commit 5ce88f3

Please sign in to comment.