From df7a9448b0ff9a5e8405fce5d43ee2e2e7e8a965 Mon Sep 17 00:00:00 2001
From: Shiny <brenda@wallace.net.nz>
Date: Mon, 13 Nov 2017 22:54:55 +1300
Subject: [PATCH] Underscore prefix on our last unused args (#1442)

---
 .rubocop_todo.yml                      | 7 -------
 app/controllers/sessions_controller.rb | 2 +-
 config/unicorn.rb                      | 4 ++--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b303fd313..211de1ca6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -10,13 +10,6 @@ Lint/HandleExceptions:
   Exclude:
     - 'lib/tasks/testing.rake'
 
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'app/controllers/sessions_controller.rb'
-    - 'config/unicorn.rb'
-
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
 Lint/UnusedMethodArgument:
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 968e71e33..6106e0c75 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -2,7 +2,7 @@ class SessionsController < Devise::SessionsController
   respond_to :json
 
   def create
-    super do |resource|
+    super do |_resource|
       if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
         flash[:alert] = "There are crops waiting to be wrangled."
       end
diff --git a/config/unicorn.rb b/config/unicorn.rb
index e4153a81f..6a63af23f 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -3,7 +3,7 @@ worker_processes 3
 timeout 30
 preload_app true
 
-before_fork do |server, worker|
+before_fork do |_server, _worker|
   Signal.trap 'TERM' do
     puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
     Process.kill 'QUIT', Process.pid
@@ -13,7 +13,7 @@ before_fork do |server, worker|
     ActiveRecord::Base.connection.disconnect!
 end
 
-after_fork do |server, worker|
+after_fork do |_server, _worker|
   Signal.trap 'TERM' do
     puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
   end