Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade spree to point to 1c3dfc7fb #2285

Merged
merged 1 commit into from
May 16, 2018
Merged

Upgrade spree to point to 1c3dfc7fb #2285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem 'pg'
# OFN-maintained and patched version of Spree v2.0.4. See
# https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade
# for details.
gem 'spree', github: 'coopdevs/spree', branch: '2-0-4-stable'
gem 'spree', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'

gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'
Expand Down
44 changes: 19 additions & 25 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,22 @@ GIT
activemodel (~> 3.0)

GIT
remote: https://github.com/coopdevs/spree.git
revision: 6c3d8841018de80f41c9400611de2e8a51923711
remote: https://github.com/jeremydurham/custom-err-msg.git
revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
specs:
custom_error_message (1.1.1)

GIT
remote: https://github.com/openfoodfoundation/ofn-qz.git
revision: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
ref: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
specs:
ofn-qz (0.1.0)
railties (~> 3.1)

GIT
remote: https://github.com/openfoodfoundation/spree.git
revision: 1c3dfc7fb48cde32f7dc49a59c1daf65a3ee6974
branch: 2-0-4-stable
specs:
spree (2.0.4)
Expand Down Expand Up @@ -63,20 +77,6 @@ GIT
spree_sample (2.0.4)
spree_core (= 2.0.4)

GIT
remote: https://github.com/jeremydurham/custom-err-msg.git
revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
specs:
custom_error_message (1.1.1)

GIT
remote: https://github.com/openfoodfoundation/ofn-qz.git
revision: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
ref: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
specs:
ofn-qz (0.1.0)
railties (~> 3.1)

GIT
remote: https://github.com/spree-contrib/better_spree_paypal_express.git
revision: 1206925d1c85bdc4b68b728d6676150ab0785486
Expand Down Expand Up @@ -137,16 +137,10 @@ GEM
sprockets (~> 2.2.1)
active_model_serializers (0.8.3)
activemodel (>= 3.0)
active_utils (2.2.3)
activesupport (>= 2.3.11)
i18n
activemerchant (1.43.3)
active_utils (~> 2.0, >= 2.0.1)
activesupport (>= 2.3.14, < 5.0.0)
activemerchant (1.78.0)
Copy link
Contributor Author

@sauloperez sauloperez May 14, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mkllnk @oeoeaio I think you guys mentioned something about activemerchant versions somewhere but I don't remember what.

Found it: #2270

activesupport (>= 3.2.14, < 6.x)
builder (>= 2.1.2, < 4.0.0)
i18n (~> 0.5)
json (~> 1.7)
money (< 7.0.0)
i18n (>= 0.6.9)
nokogiri (~> 1.4)
activemodel (3.2.21)
activesupport (= 3.2.21)
Expand Down