diff --git a/Gemfile b/Gemfile index af0d5d30dc..64620156ae 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby "1.9.3" gem 'rails', '3.2.8' gem 'pg' -gem 'spree', '1.1.3' +gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-1-stable' gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git' gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git', :branch => '1-1-stable' gem 'spree_last_address', :git => 'git://github.com/dancinglightning/spree-last-address.git' diff --git a/Gemfile.lock b/Gemfile.lock index 2c8b08631d..ab046c1c6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,6 +21,54 @@ GIT aws-sdk (~> 1.3.4) spree_core (>= 0.70.0) +GIT + remote: git://github.com/spree/spree.git + revision: d66ffac9088d0d5d0b0d146f305044ce619f0464 + branch: 1-1-stable + specs: + spree (1.1.3) + spree_api (= 1.1.3) + spree_auth (= 1.1.3) + spree_cmd (= 1.1.3) + spree_core (= 1.1.3) + spree_dash (= 1.1.3) + spree_promo (= 1.1.3) + spree_sample (= 1.1.3) + spree_api (1.1.3) + rabl (= 0.6.5) + spree_auth (= 1.1.3) + spree_core (= 1.1.3) + spree_auth (1.1.3) + cancan (= 1.6.7) + devise (~> 2.0.0) + spree_core (= 1.1.3) + spree_cmd (1.1.3) + thor (>= 0.14.6) + spree_core (1.1.3) + activemerchant (= 1.28.0) + acts_as_list (= 0.1.4) + aws-sdk (~> 1.3.4) + deface (>= 0.9.0) + ffaker (~> 1.12.0) + highline (= 1.6.11) + jquery-rails (~> 2.0) + kaminari (= 0.13.0) + nested_set (= 1.7.0) + paperclip (~> 2.7) + rails (~> 3.2.8) + ransack (~> 0.6.0) + state_machine (= 1.1.2) + stringex (~> 1.3.2) + spree_dash (1.1.3) + httparty (~> 0.8.1) + spree_auth (= 1.1.3) + spree_core (= 1.1.3) + spree_promo (1.1.3) + spree_auth (= 1.1.3) + spree_core (= 1.1.3) + spree_sample (1.1.3) + spree_core (= 1.1.3) + GIT remote: git://github.com/spree/spree_i18n.git revision: a96bee02340e008e60549295a4f09e047fd2e628 @@ -57,14 +105,14 @@ GEM active_utils (1.0.5) activesupport (>= 2.3.11) i18n - activemerchant (1.20.4) + activemerchant (1.28.0) active_utils (>= 1.0.2) activesupport (>= 2.3.11) - braintree (>= 2.0.0) builder (>= 2.0.0) i18n json (>= 1.5.1) - money (<= 3.7.1) + money + nokogiri activemodel (3.2.8) activesupport (= 3.2.8) builder (~> 3.0.0) @@ -95,8 +143,6 @@ GEM nokogiri (>= 1.4.4) uuidtools (~> 2.1) bcrypt-ruby (3.0.1) - braintree (2.17.0) - builder (>= 2.0.0) bugsnag (1.1.2) httparty (~> 0.8.3) multi_json (~> 1.3.4) @@ -158,13 +204,14 @@ GEM multi_xml i18n (0.6.1) journey (1.0.4) - jquery-rails (2.0.3) + jquery-rails (2.1.2) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.5) - kaminari (0.14.1) + kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + railties (>= 3.0.0) kgio (2.7.4) libv8 (3.3.10.4) libwebsocket (0.1.3) @@ -175,8 +222,9 @@ GEM treetop (~> 1.4.8) method_source (0.8) mime-types (1.19) - money (3.7.1) + money (5.0.0) i18n (~> 0.4) + json multi_json (1.3.6) multi_xml (0.5.1) nested_set (1.7.0) @@ -262,48 +310,6 @@ GEM activesupport (>= 3.0.0) slop (3.3.3) spork (1.0.0rc3) - spree (1.1.3) - spree_api (= 1.1.3) - spree_auth (= 1.1.3) - spree_cmd (= 1.1.3) - spree_core (= 1.1.3) - spree_dash (= 1.1.3) - spree_promo (= 1.1.3) - spree_sample (= 1.1.3) - spree_api (1.1.3) - rabl (= 0.6.5) - spree_auth (= 1.1.3) - spree_core (= 1.1.3) - spree_auth (1.1.3) - cancan (= 1.6.7) - devise (~> 2.0.0) - spree_core (= 1.1.3) - spree_cmd (1.1.3) - thor (>= 0.14.6) - spree_core (1.1.3) - activemerchant (= 1.20.4) - acts_as_list (= 0.1.4) - aws-sdk (~> 1.3.4) - deface (>= 0.9.0) - ffaker (~> 1.12.0) - highline (= 1.6.11) - jquery-rails (~> 2.0.0) - kaminari (>= 0.13.0) - nested_set (= 1.7.0) - paperclip (~> 2.7) - rails (~> 3.2.6) - ransack (~> 0.6.0) - state_machine (= 1.1.2) - stringex (~> 1.3.2) - spree_dash (1.1.3) - httparty (~> 0.8.1) - spree_auth (= 1.1.3) - spree_core (= 1.1.3) - spree_promo (1.1.3) - spree_auth (= 1.1.3) - spree_core (= 1.1.3) - spree_sample (1.1.3) - spree_core (= 1.1.3) sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) @@ -358,7 +364,7 @@ DEPENDENCIES shoulda-matchers simple_form! spork (~> 1.0rc) - spree (= 1.1.3) + spree! spree_heroku! spree_i18n! spree_last_address!