Update activemerchant dependency to match our apps, and remove error …

…when installed with protected_attributes so that it will successfully bundle.
Fullscript · Jun 11, 2015 · e6d6cbc · e6d6cbc
1 parent 0b5f3d4
commit e6d6cbc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files        = Dir['LICENSE', 'README.md', 'app/**/*', 'config/**/*', 'lib/**/*', 'db/**/*', 'vendor/**/*']
   s.require_path = 'lib'
 
-  s.add_dependency 'activemerchant', '~> 1.43.1'
+  s.add_dependency 'activemerchant', '~> 1.49.0'
   s.add_dependency 'acts_as_list', '= 0.3.0'
   s.add_dependency 'awesome_nested_set', '~> 3.0.0.rc.3'
   s.add_dependency 'aws-sdk', '1.27.0'

diff --git a/lib/spree.rb b/lib/spree.rb
@@ -4,12 +4,12 @@
 require 'spree_frontend'
 require 'spree_sample'
 
-begin
-  require 'protected_attributes'
-  puts "*" * 75
-  puts "[FATAL] Spree does not work with the protected_attributes gem installed!"
-  puts "You MUST remove this gem from your Gemfile. It is incompatible with Spree."
-  puts "*" * 75
-  exit
-rescue LoadError
-end
+# begin
+#   require 'protected_attributes'
+#   puts "*" * 75
+#   puts "[FATAL] Spree does not work with the protected_attributes gem installed!"
+#   puts "You MUST remove this gem from your Gemfile. It is incompatible with Spree."
+#   puts "*" * 75
+#   exit
+# rescue LoadError
+# end