raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Spree to 2.0.4 instead of 2.0.13

Browse Source 
Although we don't know how big the fixes introduced between 2.0.4 and
2.0.13 are, jumping from roughly 1.3.99 to 2.0.13 seems too big of
a change to do in one go.

Unless more issues like this one come up that force us to upgrade to
a newer version I believe it's best to be conservative. You'll find an
in-depth explanation in
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade#getting-to-version-204-

A previous effort was done to upgrade to v2.0.13 in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2209
This commit is contained in:
Pau Perez
2018-04-18 08:56:03 +02:00
parent 06ef2a4c63
commit 58f3b5a97e
2 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -11,7 +11,7 @@ gem 'i18n-js', '~> 3.0.0'
gem 'nokogiri', '>= 1.6.7.1'
gem 'pg'
gem 'spree', '2.0.13'
gem 'spree', '2.0.4'
gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'

112
Gemfile.lock
View File

@@ -107,7 +107,7 @@ GEM
multi_json (~> 1.0)
acts-as-taggable-on (3.5.0)
activerecord (>= 3.2, < 5)
acts_as_list (0.3.0)
acts_as_list (0.2.0)
activerecord (>= 3.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
@@ -121,10 +121,11 @@ GEM
arel (3.0.3)
ast (2.3.0)
atomic (1.1.99)
awesome_nested_set (2.1.6)
awesome_nested_set (2.1.5)
activerecord (>= 3.0.0)
awesome_print (1.0.2)
aws-sdk (1.31.3)
aws-sdk (1.3.9)
httparty (~> 0.7)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
@@ -373,7 +374,7 @@ GEM
rspec (>= 2.99.0, < 4.0)
haml (4.0.4)
tilt
highline (1.6.21)
highline (1.6.18)
hike (1.2.3)
http_parser.rb (0.6.0)
httparty (0.16.2)
@@ -398,7 +399,7 @@ GEM
multi_json (~> 1.0)
rspec (>= 2.0, < 4.0)
jwt (1.5.4)
kaminari (0.15.1)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.3)
@@ -422,10 +423,8 @@ GEM
mini_portile2 (2.1.0)
momentjs-rails (2.5.1)
railties (>= 3.1)
monetize (1.7.0)
money (~> 6.9)
money (6.11.0)
i18n (>= 0.6.4, < 1.1)
money (5.1.1)
i18n (~> 0.6.0)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -470,8 +469,8 @@ GEM
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
polyamorous (0.6.4)
activerecord (>= 3.0)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.5)
powerpack (0.1.1)
pry (0.11.2)
@@ -481,7 +480,7 @@ GEM
byebug (>= 9.0, < 9.1)
pry (~> 0.10)
public_suffix (3.0.0)
rabl (0.9.3)
rabl (0.8.4)
activesupport (>= 2.3.14)
rack (1.4.7)
rack-cache (1.7.0)
@@ -514,10 +513,10 @@ GEM
rake
raindrops (0.13.0)
rake (10.5.0)
ransack (1.1.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
polyamorous (~> 0.6.0)
ransack (0.7.2)
actionpack (~> 3.0)
activerecord (~> 3.0)
polyamorous (~> 0.5.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@@ -590,55 +589,57 @@ GEM
activesupport (>= 3.0.0)
spinjs-rails (1.3)
rails (>= 3.1)
spree (2.0.13)
spree_api (= 2.0.13)
spree_backend (= 2.0.13)
spree_cmd (= 2.0.13)
spree_core (= 2.0.13)
spree_frontend (= 2.0.13)
spree_sample (= 2.0.13)
spree_api (2.0.13)
rabl (= 0.9.3)
spree_core (= 2.0.13)
versioncake (~> 1.2.0)
spree_backend (2.0.13)
spree (2.0.4)
spree_api (= 2.0.4)
spree_backend (= 2.0.4)
spree_cmd (= 2.0.4)
spree_core (= 2.0.4)
spree_frontend (= 2.0.4)
spree_sample (= 2.0.4)
spree_api (2.0.4)
rabl (= 0.8.4)
spree_core (= 2.0.4)
versioncake (= 1.0.0)
spree_backend (2.0.4)
deface (>= 0.9.0)
jquery-rails (~> 3.0.0)
jquery-ui-rails (~> 4.0.0)
rails (~> 3.2.8)
select2-rails (~> 3.4.7)
spree_api (= 2.0.13)
spree_core (= 2.0.13)
spree_cmd (2.0.13)
thor (~> 0.14)
spree_core (2.0.13)
activemerchant (~> 1.43.1)
acts_as_list (= 0.3.0)
awesome_nested_set (= 2.1.6)
aws-sdk (= 1.31.3)
spree_api (= 2.0.4)
spree_core (= 2.0.4)
spree_cmd (2.0.4)
thor (>= 0.14.6)
spree_core (2.0.4)
activemerchant (~> 1.34)
acts_as_list (= 0.2.0)
awesome_nested_set (= 2.1.5)
aws-sdk (~> 1.3.4)
cancan (~> 1.6.10)
deface (= 1.0.0)
ffaker (~> 1.22.0)
highline (~> 1.6.18)
deface (>= 0.9.1)
ffaker (~> 1.16)
highline (= 1.6.18)
httparty (~> 0.11)
json (~> 1.7)
kaminari (~> 0.15.0)
monetize
json (>= 1.7.7)
kaminari (~> 0.14.1)
money (= 5.1.1)
paperclip (~> 3.4.1)
paranoia (~> 1.3)
rails (~> 3.2.21)
ransack (~> 1.1.0)
rails (~> 3.2.14)
ransack (= 0.7.2)
state_machine (= 1.2.0)
stringex (~> 1.5.1)
truncate_html (= 0.9.2)
spree_frontend (2.0.13)
spree_frontend (2.0.4)
canonical-rails
deface (>= 0.9.0)
jquery-rails (~> 3.0.0)
rails (~> 3.2.13)
spree_api (= 2.0.13)
spree_core (= 2.0.13)
spree_api (= 2.0.4)
spree_core (= 2.0.4)
stringex (~> 1.5.1)
spree_sample (2.0.13)
spree_core (= 2.0.13)
spree_sample (2.0.4)
spree_core (= 2.0.4)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -674,11 +675,10 @@ GEM
rack
unicorn
uuidtools (2.1.5)
versioncake (1.2.0)
actionpack (>= 3.2)
activesupport (>= 3.2)
railties (>= 3.2)
tzinfo
versioncake (1.0.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
warden (1.2.7)
rack (>= 1.0)
webmock (1.8.11)
@@ -781,7 +781,7 @@ DEPENDENCIES
simple_form!
skylight (< 2.0)
spinjs-rails
spree (= 2.0.13)
spree (= 2.0.4)
spree_auth_devise!
spree_i18n!
spree_paypal_express!