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

Use older spree_auth_devise

Browse Source
This commit is contained in:
Enrico Stano
2017-08-03 18:40:42 +02:00
committed by Rob Harrington
parent 7e5e167215
commit 318f89f9a2
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -12,7 +12,7 @@ gem 'nokogiri', '>= 1.6.7.1'
gem 'pg'
gem 'spree', github: 'coopdevs/spree', branch: 'spree-upgrade-step-6'
gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch: 'spree-upgrade-intermediate'
gem 'spree_auth_devise', github: 'coopdevs/spree_auth_devise', branch: 'spree-upgrade-trying-to-fix-capture-button'
# Our branch contains two changes
# - Pass customer email and phone number to PayPal (merged to upstream master)

31
Gemfile.lock
View File

@@ -67,6 +67,19 @@ GIT
spree_sample (1.3.99)
spree_core (= 1.3.99)
GIT
remote: git://github.com/coopdevs/spree_auth_devise.git
revision: e93d21f2f0d808178d07e066ce802d95722c4c95
branch: spree-upgrade-trying-to-fix-capture-button
specs:
spree_auth_devise (1.0.0)
cancan (~> 1.6.7)
devise (~> 2.2.3)
devise-encryptable (= 0.1.1)
spree_backend (~> 1.3.6)
spree_core (~> 1.3.6)
spree_frontend (~> 1.3.6)
GIT
remote: git://github.com/jeremydurham/custom-err-msg.git
revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
@@ -89,18 +102,6 @@ GIT
ofn-qz (0.1.0)
railties (~> 3.1)
GIT
remote: git://github.com/openfoodfoundation/spree_auth_devise.git
revision: da9eecefc6fe13dedf4c6f3febec79caad839ec3
branch: spree-upgrade-intermediate
specs:
spree_auth_devise (2.0.0)
devise (~> 2.2.5)
devise-encryptable (= 0.1.2)
spree_backend (~> 1.3.6)
spree_core (~> 1.3.6)
spree_frontend (~> 1.3.6)
GIT
remote: git://github.com/spree/deface.git
revision: 1110a1336252109bce7f98f9182042e0bc2930ae
@@ -266,8 +267,8 @@ GEM
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
devise-encryptable (0.1.2)
devise (>= 2.1.0)
devise-encryptable (0.1.1)
devise (>= 2.1.0.rc)
diff-lcs (1.2.4)
diffy (3.1.0)
em-websocket (0.5.0)
@@ -661,7 +662,7 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
warden (1.2.6)
warden (1.2.7)
rack (>= 1.0)
webmock (1.8.11)
addressable (>= 2.2.7)