From ee604dc2b087400ef0faab08e2784a8ba9bdc94e Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Fri, 10 Jun 2016 16:04:00 +0930
Subject: [PATCH] Upgrade activemerchant, fixing rails 5 deprecation warnings

---
 Gemfile      |  4 ++--
 Gemfile.lock | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7970a00f4..6dd1d971b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,8 +36,8 @@ gem 'comfortable_mexican_sofa', '~> 1.12.0' # content management system
 gem 'kaminari'                     # pagination
 gem 'bootstrap-kaminari-views'     # bootstrap views for kaminari
 
-gem 'activemerchant', '1.33.0'
-gem 'active_utils', '1.0.5'
+gem 'activemerchant'
+gem 'active_utils'
 
 # Markdown formatting for updates etc
 gem 'bluecloth'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2769dcdec..24d475118 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,20 +24,17 @@ GEM
       actionpack
     active_merchant-paypal-bogus-gateway (0.1.0)
       activemerchant
-    active_utils (1.0.5)
-      activesupport (>= 2.3.11)
+    active_utils (3.2.0)
+      activesupport (>= 3.2)
       i18n
     activejob (4.2.6)
       activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemerchant (1.33.0)
-      active_utils (>= 1.0.2)
-      activesupport (>= 2.3.14)
-      builder (>= 2.0.0)
-      i18n
-      json (>= 1.5.1)
-      money
-      nokogiri
+    activemerchant (1.59.0)
+      activesupport (>= 3.2.14, < 5.1)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (>= 0.6.9)
+      nokogiri (~> 1.4)
     activemodel (4.2.6)
       activesupport (= 4.2.6)
       builder (~> 3.1)
@@ -274,9 +271,6 @@ GEM
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
     minitest (5.9.0)
-    money (6.7.1)
-      i18n (>= 0.6.4, <= 0.7.0)
-      sixarm_ruby_unaccent (>= 1.1.1, < 2)
     multi_json (1.11.3)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -415,7 +409,6 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sixarm_ruby_unaccent (1.1.1)
     slop (3.6.0)
     sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
@@ -459,8 +452,8 @@ PLATFORMS
 
 DEPENDENCIES
   active_merchant-paypal-bogus-gateway
-  active_utils (= 1.0.5)
-  activemerchant (= 1.33.0)
+  active_utils
+  activemerchant
   better_errors
   binding_of_caller
   bluecloth