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

Start Spree upgrade step 2

Browse Source
This commit is contained in:
Rohan Mitchell
2016-09-16 12:33:53 +10:00
committed by Rob Harrington
parent 36022fb143
commit f5c4537afa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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: 'spree-upgrade-step1c'
gem 'spree', github: 'openfoodfoundation/spree', branch: 'spree-upgrade-step-2'
gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '1-3-stable'

8
Gemfile.lock
View File

@@ -30,8 +30,8 @@ GIT
GIT
remote: git://github.com/openfoodfoundation/spree.git
revision: a4c439570b77afa50f9e36299811f293232bd281
branch: spree-upgrade-step1c
revision: ba444ace4de81626ef0a69a44123e25084874b4a
branch: spree-upgrade-step-2
specs:
spree (1.3.99)
spree_api (= 1.3.99)
@@ -54,7 +54,7 @@ GIT
deface (>= 0.9.0)
ffaker (~> 1.15.0)
highline (= 1.6.11)
jquery-rails (~> 2.0)
jquery-rails (~> 2.1.4)
json (>= 1.5.5)
kaminari (= 0.13.0)
money (= 5.0.0)
@@ -426,7 +426,7 @@ GEM
ipaddress (0.8.0)
journey (1.0.4)
jquery-migrate-rails (1.2.1)
jquery-rails (2.3.0)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)