diff --git a/Gemfile b/Gemfile index e1983b6ee1..1345267977 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/spree/spree_paypal_express.git', :branch => '1-1-stable' +gem 'spree_paypal_express', :git => 'git://github.com/RohanM/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 f67a5aadc7..6043c4c35e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,6 +6,15 @@ GIT actionpack (~> 3.0) activemodel (~> 3.0) +GIT + remote: git://github.com/RohanM/spree_paypal_express.git + revision: ca5723c0e268e74adcb9b8ec04d082d86888f313 + 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 @@ -77,15 +86,6 @@ GIT i18n (~> 0.5) spree (~> 1.1) -GIT - remote: git://github.com/spree/spree_paypal_express.git - revision: 2c61f1700ef853e3d4f39739793dc3308422e94b - 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: @@ -158,7 +158,7 @@ GEM xpath (~> 0.1.4) childprocess (0.3.2) ffi (~> 1.0.6) - cocaine (0.3.0) + cocaine (0.4.0) coderay (1.0.7) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -209,7 +209,7 @@ GEM multi_xml i18n (0.6.1) journey (1.0.4) - jquery-rails (2.1.2) + jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.5) @@ -237,7 +237,7 @@ GEM railties (>= 3.0.0) nokogiri (1.5.5) orm_adapter (0.0.7) - paperclip (2.7.0) + paperclip (2.8.0) activerecord (>= 2.3.0) activesupport (>= 2.3.2) cocaine (>= 0.0.2) @@ -261,7 +261,7 @@ GEM rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) rails (3.2.8) actionmailer (= 3.2.8) @@ -325,7 +325,7 @@ GEM libv8 (~> 3.3.10) thor (0.16.0) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.11) polyglot polyglot (>= 0.3.1) truncate_html (0.5.5)