Solved bundler conflicts with new jquery-rails

[Fixes #956]
spree · Jan 9, 2012 · 472cb51 · 472cb51
1 parent 5403083
commit 472cb51
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
@@ -21,14 +21,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'acts_as_list', '= 0.1.4'
   s.add_dependency 'nested_set', '= 1.6.8'
 
-  s.add_dependency 'jquery-rails', '>= 1.0.18'
+  s.add_dependency 'jquery-rails', '>= 1.0.18', '<= 1.0.19'
   s.add_dependency 'highline', '= 1.6.8'
   s.add_dependency 'state_machine', '= 1.1.1'
   s.add_dependency 'ffaker', '~> 1.12.0'
   s.add_dependency 'paperclip', '= 2.4.1'
   s.add_dependency 'meta_search', '= 1.1.1'
   s.add_dependency 'activemerchant', '= 1.20.1'
-  s.add_dependency 'rails', '~> 3.1.0'
+  s.add_dependency 'rails', '>= 3.1.1', '<= 3.1.3'
   s.add_dependency 'kaminari', '>= 0.13.0'
   s.add_dependency 'deface', '>= 0.7.2'
   s.add_dependency 'stringex', '~> 1.3.0'