From: Tom Hughes <tom@compton.nu>
Date: Mon, 16 May 2022 18:16:53 +0000 (+0100)
Subject: Fix new rubocop warnings
X-Git-Tag: live
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/HEAD?hp=-c

Fix new rubocop warnings
---

40ec4734fb1e4d23a0a0f468e66dde1e180fb0ca
diff --git a/.rubocop.yml b/.rubocop.yml
index dc7590df3..65db8a6a5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -96,12 +96,6 @@ Style/MixinUsage:
     - 'bin/setup'
     - 'bin/update'
 
-Style/RedundantCondition:
-  Exclude:
-    - 'app/controllers/messages_controller.rb'
-    - 'app/controllers/sessions_controller.rb'
-    - 'app/controllers/users_controller.rb'
-
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index e801915d6..cc311f93f 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -121,11 +121,7 @@ class MessagesController < ApplicationController
 
       referer = safe_referer(params[:referer]) if params[:referer]
 
-      if referer
-        redirect_to referer
-      else
-        redirect_to :action => :inbox
-      end
+      redirect_to referer || { :action => :inbox }
     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 5b46d67d0..9489553a8 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -38,11 +38,7 @@ class SessionsController < ApplicationController
 
       referer = safe_referer(params[:referer]) if params[:referer]
 
-      if referer
-        redirect_to referer
-      else
-        redirect_to :controller => "site", :action => "index"
-      end
+      redirect_to referer || { :controller => "site", :action => "index" }
     end
   end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3489b4eda..534f98810 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -136,11 +136,7 @@ class UsersController < ApplicationController
     if current_user
       # The user is logged in already, so don't show them the signup
       # page, instead send them to the home page
-      if @referer
-        redirect_to @referer
-      else
-        redirect_to :controller => "site", :action => "index"
-      end
+      redirect_to @referer || { :controller => "site", :action => "index" }
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)
       self.current_user = User.new(:email => params[:email],
                                    :email_confirmation => params[:email],