From fc5b339e2a431c2aa20936c030697ffb25d7b11a Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Sat, 20 May 2017 11:29:45 +1000
Subject: [PATCH] Rubocop: Correct Lint/DuplicateMethods offences

---
 .rubocop_todo.yml                                | 5 -----
 app/controllers/admin/order_cycles_controller.rb | 6 +-----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1102431ed5..82a82a20d6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -50,11 +50,6 @@ Lint/DeprecatedClassMethods:
   Exclude:
     - 'app/controllers/admin/product_import_controller.rb'
 
-# Offense count: 1
-Lint/DuplicateMethods:
-  Exclude:
-    - 'app/controllers/admin/order_cycles_controller.rb'
-
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
diff --git a/app/controllers/admin/order_cycles_controller.rb b/app/controllers/admin/order_cycles_controller.rb
index 1d5d018522..5646099cd5 100644
--- a/app/controllers/admin/order_cycles_controller.rb
+++ b/app/controllers/admin/order_cycles_controller.rb
@@ -115,7 +115,7 @@ module Admin
     end
 
     def collection_actions
-      [:index]
+      [:index, :bulk_update]
     end
 
     private
@@ -179,9 +179,5 @@ module Admin
     def ams_prefix_whitelist
       [:basic]
     end
-
-    def collection_actions
-      [:index, :bulk_update]
-    end
   end
 end