Skip to content

Commit

Permalink
Update Gemfile to get spree from a feature branch
Browse files Browse the repository at this point in the history
This allows us to test
openfoodfoundation/spree#41. If it passes
testing I will then revert it back to the `2-0-4-stable` branch but
updating the target commit in the Gemfile.lock.
  • Loading branch information
sauloperez committed Jul 16, 2019
1 parent 77c78f3 commit d81a040
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ gem 'pg'
# for details.
gem 'spree_api', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
gem 'spree_backend', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
gem 'spree_core', github: 'coopdevs/spree', branch: 'handle-soft-deleted-variants-in-order-edit'

gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'
gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
Expand Down
58 changes: 29 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,9 @@ GIT
activemodel (~> 3.0)

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/better_spree_paypal_express.git
revision: 27ad7165ea4c6e8c5f120b42b676cb9c2c272100
branch: 2-0-stable
specs:
spree_paypal_express (2.0.3)
paypal-sdk-merchant (= 1.106.1)
spree_core (~> 2.0.3)

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: 46d6f8f5fd434105b0c69958276d1727a3066a97
branch: 2-0-4-stable
remote: https://github.com/coopdevs/spree.git
revision: b5a37e95a0d54e37aab42b32a29f23906116700e
branch: handle-soft-deleted-variants-in-order-edit
specs:
spree_api (2.0.4)
rabl (= 0.8.4)
Expand All @@ -59,7 +36,7 @@ GIT
json (>= 1.7.7)
kaminari (~> 0.14.1)
money (= 5.1.1)
paperclip (~> 3.0)
paperclip (~> 3.4.1)
paranoia (~> 1.3)
rails (~> 3.2.14)
ransack (= 0.7.2)
Expand All @@ -75,6 +52,29 @@ GIT
spree_core (= 2.0.4)
stringex (~> 1.5.1)

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/better_spree_paypal_express.git
revision: 27ad7165ea4c6e8c5f120b42b676cb9c2c272100
branch: 2-0-stable
specs:
spree_paypal_express (2.0.3)
paypal-sdk-merchant (= 1.106.1)
spree_core (~> 2.0.3)

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/spree_auth_devise.git
revision: 0181835fb6ac77a05191d26f6f32a0f4a548d851
Expand Down Expand Up @@ -286,7 +286,7 @@ GEM
railties (>= 3.0.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffaker (1.22.1)
ffaker (1.32.1)
ffi (1.10.0)
figaro (1.1.1)
thor (~> 0.14)
Expand Down Expand Up @@ -681,7 +681,7 @@ GEM
ruby-rc4 (0.1.5)
rubyzip (1.2.2)
safe_yaml (1.0.5)
sass (3.3.14)
sass (3.4.25)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
Expand Down

0 comments on commit d81a040

Please sign in to comment.