diff --git a/Gemfile b/Gemfile index 1345267977..e1983b6ee1 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '3.2.8' gem 'pg' 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/RohanM/spree_paypal_express.git', :branch => '1-1-stable' +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' gem 'comfortable_mexican_sofa' diff --git a/Gemfile.lock b/Gemfile.lock index 4f360e5dba..67ec6d1663 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,15 +6,6 @@ GIT actionpack (~> 3.0) activemodel (~> 3.0) -GIT - remote: git://github.com/RohanM/spree_paypal_express.git - revision: 5c00485cce420967ab6b7ef372949dda64d3a6a7 - branch: 1-1-stable - specs: - spree_paypal_express (1.1.0) - spree_auth (>= 1.0.0) - spree_core (>= 1.0.0) - GIT remote: git://github.com/dancinglightning/spree-last-address.git revision: f5ed71a5482fbc16da559737903bb46fe032c150 @@ -32,7 +23,7 @@ GIT GIT remote: git://github.com/spree/spree.git - revision: d66ffac9088d0d5d0b0d146f305044ce619f0464 + revision: 46691e075129fd3d7b59e296d73149a9066c1b9d branch: 1-1-stable specs: spree (1.1.3) @@ -63,7 +54,7 @@ GIT jquery-rails (~> 2.0) kaminari (= 0.13.0) nested_set (= 1.7.0) - paperclip (~> 2.7) + paperclip (~> 2.8) rails (~> 3.2.8) ransack (~> 0.6.0) state_machine (= 1.1.2) @@ -86,6 +77,15 @@ GIT i18n (~> 0.5) spree (~> 1.1) +GIT + remote: git://github.com/spree/spree_paypal_express.git + revision: 267be504e4affd7866a5e31e80565126f9db7cc3 + branch: 1-1-stable + specs: + spree_paypal_express (1.1.0) + spree_auth (>= 1.0.0) + spree_core (>= 1.0.0) + GEM remote: http://rubygems.org/ specs: