Merge pull request #3477 from LocalOrbit/master

Merge staging

.rubocop.yml

@@ -285,7 +285,7 @@ Layout/DefEndAlignment:
 
 # Multi-line method chaining should be done with leading dots.
 Layout/DotPosition:
-  EnforcedStyle: leading
+  EnforcedStyle: trailing
   SupportedStyles:
     - leading
     - trailing
@@ -589,7 +589,7 @@ Layout/SpaceInsideArrayLiteralBrackets:
     - no_space
 
 Layout/SpaceInsideBlockBraces:
-  EnforcedStyle: space
+  EnforcedStyle: no_space
   SupportedStyles:
     - space
     - no_space

app/controllers/orders_controller.rb

@@ -100,7 +100,7 @@ def create
         session.delete(:current_delivery_day)
         @grouped_items = @order.items.for_checkout
       else
-        Rollbar.info('Order could not be completed', context: @placed_order.context)
+        Rollbar.warning('Order could not be completed', context_error: @placed_order.context[:error])
 
         if @placed_order.context.key?(:cart_is_empty)
           @grouped_items = current_cart.items.for_checkout

lib/tasks/production-copy.rake

@@ -284,10 +284,10 @@ module CloneProductionHelper
     refs_to_clear += balanced_payments_refs_to_clear
     refs_to_clear += stripe_refs_to_clear
 
-    refs_to_clear.each do |model, fields|
-      fields.each do |field|
-        puts "Setting all #{model.name}##{field} to nil"
-        model.update_all("#{field} = NULL")
+    refs_to_clear.each do |hash|
+      hash[:fields].each do |field|
+        puts "Setting all #{hash[:model].name}##{field} to nil"
+        hash[:model].update_all("#{field} = NULL")
       end
     end
   end