Merge pull request #8649 from Matt-Yorkley/deprecation-fixes

Deprecation fixes

config/initializers/cancancan.rb

@@ -0,0 +1,12 @@
+module CanCanUnauthorizedMessage
+  # Fix deprecated syntax calling I18n#translate (using keyword args) without using **
+  def unauthorized_message(action, subject)
+    keys = unauthorized_message_keys(action, subject)
+    variables = {:action => action.to_s}
+    variables[:subject] = (subject.class == Class ? subject : subject.class).to_s.underscore.humanize.downcase
+    message = I18n.translate(nil, **variables.merge(:scope => :unauthorized, :default => keys + [""]))
+    message.blank? ? nil : message
+  end
+end
+
+CanCan::Ability.prepend(CanCanUnauthorizedMessage)

lib/open_food_network/sales_tax_report.rb

@@ -37,7 +37,7 @@ module OpenFoodNetwork
 
     def search
       permissions = ::Permissions::Order.new(user)
-      permissions.editable_orders.complete.not_state(:canceled).search(params[:q])
+      permissions.editable_orders.complete.not_state(:canceled).ransack(params[:q])
     end
 
     def orders