Skip to content
Open
Changes from all commits
Commits
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
21 changes: 12 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
GIT
remote: git://github.com/spree/spree_auth_devise.git
revision: 997382fcb1f6ed78a201ee7016384cfe71745aea
remote: https://github.com/spree/spree_auth_devise.git
revision: 5a3857f8745736de6a7d4030c4a2c0493a3eb574
branch: 2-4-stable
specs:
spree_auth_devise (2.2.0)
devise (~> 3.2.3)
spree_auth_devise (2.4.0)
devise (~> 3.5.4)
devise-encryptable (= 0.1.2)
json
multi_json
Expand Down Expand Up @@ -64,7 +64,7 @@ GEM
arel (5.0.1.20140414130214)
awesome_nested_set (3.0.2)
activerecord (>= 4.0.0, < 5)
bcrypt (3.1.10)
bcrypt (3.1.18)
bourne (1.5.0)
mocha (>= 0.13.2, < 0.15)
builder (3.2.2)
Expand Down Expand Up @@ -103,10 +103,11 @@ GEM
nokogiri (~> 1.6.0)
polyglot
rails (>= 3.1)
devise (3.2.4)
devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-encryptable (0.1.2)
Expand Down Expand Up @@ -223,6 +224,8 @@ GEM
activesupport (>= 3.0)
i18n
polyamorous (~> 1.1)
responders (1.1.2)
railties (>= 3.2, < 4.2)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
Expand Down Expand Up @@ -310,22 +313,22 @@ GEM
state_machine (1.2.0)
stringex (1.5.1)
thor (0.19.1)
thread_safe (0.3.5)
thread_safe (0.3.6)
tilt (1.4.1)
truncate_html (0.9.2)
twitter_cldr (3.1.2)
camertron-eprun
cldr-plurals-runtime-rb (~> 1.0.0)
json
tzinfo
tzinfo (1.2.2)
tzinfo (1.2.10)
thread_safe (~> 0.1)
versioncake (2.3.1)
actionpack (>= 3.2)
activesupport (>= 3.2)
railties (>= 3.2)
tzinfo
warden (1.2.3)
warden (1.2.7)
rack (>= 1.0)
websocket-driver (0.3.2)
xpath (2.0.0)
Expand Down