diff --git a/Gemfile b/Gemfile index 087f734e45..19937fb6b9 100644 --- a/Gemfile +++ b/Gemfile @@ -33,12 +33,6 @@ gem 'ransack', '~> 1.8.10' gem 'state_machines-activerecord' gem 'stringex', '~> 2.8.5' -# Our branch contains the following changes: -# - Pass customer email and phone number to PayPal (merged to upstream master) -# - Change type of password from string to password to hide it in the form -# - Skip CA cert file and use the ones provided by the OS -gem 'spree_paypal_express', github: 'openfoodfoundation/better_spree_paypal_express', branch: '2-1-0-stable' - gem 'stripe' # We need at least this version to have Digicert's root certificate diff --git a/Gemfile.lock b/Gemfile.lock index bc70a93fd6..3e8d745f0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,14 +4,6 @@ GIT specs: custom_error_message (1.1.1) -GIT - remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git - revision: 1a477e9f7763297944cc99b6f4dd3d962aa963e9 - branch: 2-1-0-stable - specs: - spree_paypal_express (2.0.3) - paypal-sdk-merchant (= 1.106.1) - GIT remote: https://github.com/openfoodfoundation/ofn-qz.git revision: 467f6ea1c44529c7c91cac4c8211bbd863588c0b @@ -490,11 +482,6 @@ GEM activerecord (>= 4.0, < 6.2) parser (3.0.0.0) ast (~> 2.4.1) - paypal-sdk-core (0.2.10) - multi_json (~> 1.0) - xml-simple - paypal-sdk-merchant (1.106.1) - paypal-sdk-core (~> 0.2.3) pg (0.21.0) power_assert (1.2.0) pry (0.13.1) @@ -822,7 +809,6 @@ DEPENDENCIES selenium-webdriver shoulda-matchers simplecov - spree_paypal_express! spring spring-commands-rspec state_machines-activerecord