Merge pull request #8570 from mkllnk/rubocop

Update Rubocop config

.rubocop.yml

@@ -16,6 +16,3 @@ inherit_from:
   #     bundle exec rubocop -c .rubocop_styleguide.yml
   #
   - .rubocop_styleguide.yml
-
-  # A manually compiled todo list to ignore metrics violations on a file-by-file basis.
-  - .rubocop_manual_todo.yml

app/models/spree/credit_card.rb

@@ -56,8 +56,6 @@ def cc_type=(type)
     end
 
     def set_last_digits
-      number = @number.to_s.gsub(/\s/, '')
-      verification_value = verification_value.to_s.gsub(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 

app/models/spree/taxon.rb

@@ -56,7 +56,7 @@ def active_products
 
     def pretty_name
       ancestor_chain = ancestors.inject("") do |name, ancestor|
-        name += "#{ancestor.name} -> "
+        name + "#{ancestor.name} -> "
       end
       ancestor_chain + name.to_s
     end

lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb

@@ -119,7 +119,6 @@ def rules
       # rubocop:enable Metrics/MethodLength
 
       # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/PerceivedComplexity
       def columns
@@ -199,7 +198,6 @@ def columns
         ]
       end
       # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/MethodLength
       # rubocop:enable Metrics/PerceivedComplexity
 

lib/spree/core/controller_helpers/common.rb

@@ -66,7 +66,7 @@ def set_user_language
           #   The layout to render can be set inside Spree configuration with the +:layout+ option.
           # Default layout is: +app/views/spree/layouts/spree_application+
           def get_layout
-            layout ||= Spree::Config[:layout]
+            Spree::Config[:layout]
           end
         end
       end