From 2f0e3876462c7e57593bc5a28bb7f80fb5bf7490 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Wed, 7 Aug 2019 22:33:39 +1200
Subject: [PATCH] rubocop lint

---
 app/controllers/conversations_controller.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index 3ff476b6b..9d0e23386 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -41,9 +41,9 @@ class ConversationsController < ApplicationController
 
   def set_box
     @boxes = {
-      'inbox' => { 'total' => mailbox.inbox.size, 'unread' => 0},
-      'sent'  => { 'total' => mailbox.sentbox.size, 'unread' => 0},
-      'trash' => { 'total' => mailbox.trash.size, 'unread' => 0}
+      'inbox' => { 'total' => mailbox.inbox.size, 'unread' => 0 },
+      'sent'  => { 'total' => mailbox.sentbox.size, 'unread' => 0 },
+      'trash' => { 'total' => mailbox.trash.size, 'unread' => 0 }
     }
     @box = if params[:box].blank? || !@boxes.keys.include?(params[:box])
              'inbox'
@@ -55,7 +55,8 @@ class ConversationsController < ApplicationController
   def check_current_subject_in_conversation
     @conversation = Mailboxer::Conversation.find_by(id: params[:id])
     return unless @conversation.nil? || !@conversation.is_participant?(current_member)
+
     redirect_to conversations_path(box: box)
-    return
+    nil
   end
 end