raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Opening up restriction on activemerchant version by updating Spree ref

Browse Source 
Allows use of v > 1.57 which includes support for Stripe Connect
This commit is contained in:
Rob Harrington
2017-02-23 12:20:20 +11:00
parent 858852123d
commit b5a6bcdf9d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@@ -10,7 +10,7 @@ gem 'i18n-js', '~> 3.0.0'
gem 'nokogiri', '>= 1.6.7.1'
gem 'pg'
gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6-adjustment-state-migration', ref: '48febb2'
gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: '5a76d45'
gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch: 'spree-upgrade-intermediate'
@@ -20,6 +20,7 @@ gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch:
gem 'spree_paypal_express', :github => "openfoodfoundation/better_spree_paypal_express", :branch => "spree-upgrade-intermediate"
#gem 'spree_paypal_express', :github => "spree-contrib/better_spree_paypal_express", :branch => "1-3-stable"
gem 'stripe', '~>1.51.0'
gem 'activemerchant', '~> 1.71.0'
gem 'oauth2', '~> 1.2.0' # Used for Stripe Connect
gem 'jwt', '~> 1.5'

17
Gemfile.lock
View File

@@ -30,9 +30,9 @@ GIT
GIT
remote: git://github.com/openfoodfoundation/spree.git
revision: 48febb250a3b1eb2d42812b27b93457e89cde589
ref: 48febb2
branch: step-6-adjustment-state-migration
revision: 5a76d456ff70aea7aae3d25156558d71eb7febf2
ref: 5a76d45
branch: step-6a
specs:
spree (1.3.99)
spree_api (= 1.3.99)
@@ -57,7 +57,7 @@ GIT
spree_cmd (1.3.99)
thor (>= 0.14.6)
spree_core (1.3.99)
activemerchant (~> 1.50.0)
activemerchant (~> 1.50)
acts_as_list (= 0.1.9)
awesome_nested_set (= 2.1.5)
aws-sdk (~> 1.11.1)
@@ -151,8 +151,8 @@ GEM
sprockets (~> 2.2.1)
active_model_serializers (0.8.3)
activemodel (>= 3.0)
activemerchant (1.50.0)
activesupport (>= 3.2.14, < 5.0.0)
activemerchant (1.71.0)
activesupport (>= 3.2.14, < 6.x)
builder (>= 2.1.2, < 4.0.0)
i18n (>= 0.6.9)
nokogiri (~> 1.4)
@@ -457,7 +457,7 @@ GEM
multi_json (~> 1.0)
rspec (~> 2.0)
jwt (1.5.4)
kaminari (0.14.1)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
@@ -670,10 +670,10 @@ GEM
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicode-display_width (1.3.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.3.0)
unicorn (4.9.0)
kgio (~> 2.6)
rack
@@ -708,6 +708,7 @@ PLATFORMS
DEPENDENCIES
active_model_serializers
activemerchant (~> 1.71.0)
acts-as-taggable-on (~> 3.4)
andand
angular-rails-templates (~> 0.2.0)