diff --git a/Gemfile.lock b/Gemfile.lock index beefc3c..038696e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 @@ -58,17 +58,18 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - acts_as_list (0.6.0) + acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.3.5) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) arel (5.0.1.20140414130214) - awesome_nested_set (3.0.2) + awesome_nested_set (3.0.3) 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) - camertron-eprun (1.1.0) + builder (3.2.4) + camertron-eprun (1.1.1) cancancan (1.9.2) canonical-rails (0.0.8) rails (>= 3.1, < 5.0) @@ -80,11 +81,10 @@ GEM xpath (~> 2.0) carmen (1.0.2) activesupport (>= 3.0.0) - cldr-plurals-runtime-rb (1.0.0) - climate_control (0.0.3) - activesupport (>= 3.0) + cldr-plurals-runtime-rb (1.1.0) + climate_control (0.2.0) cliver (0.3.2) - cocaine (0.5.7) + cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.0) coffee-rails (4.0.1) @@ -94,19 +94,21 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - colorize (0.7.5) - css_parser (1.3.6) + colorize (0.8.1) + concurrent-ruby (1.1.9) + css_parser (1.7.1) addressable database_cleaner (1.0.1) - deface (1.0.1) + deface (1.0.2) colorize (>= 0.5.8) 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) @@ -123,45 +125,49 @@ GEM factory_girl (~> 4.2.0) railties (>= 3.0.0) ffaker (1.23.0) - font-awesome-rails (4.3.0.0) - railties (>= 3.2, < 5.0) + font-awesome-rails (4.7.0.8) + railties (>= 3.2, < 8.0) friendly_id (5.0.5) activerecord (>= 4.0.0) highline (1.6.21) hike (1.2.3) - htmlentities (4.3.3) - httparty (0.13.3) - json (~> 1.8) + htmlentities (4.3.4) + httparty (0.19.1) + mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.3) railties (>= 3.2.16) - json (1.8.2) - kaminari (0.16.3) + json (1.8.6) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) launchy (2.4.2) addressable (~> 2.3) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.7.1) + mini_mime (>= 0.1.1) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.4.3) - mini_portile (0.5.2) - minitest (5.5.1) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) + mini_mime (1.1.2) + mini_portile2 (2.1.0) + minitest (5.12.0) mocha (0.14.0) metaclass (~> 0.0.1) - monetize (1.1.0) - money (~> 6.5.0) - money (6.5.1) - i18n (>= 0.6.4, <= 0.7.0) - multi_json (1.11.0) - multi_xml (0.5.5) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + monetize (1.12.0) + money (~> 6.12) + money (6.16.0) + i18n (>= 0.6.4, <= 2) + multi_json (1.15.0) + multi_xml (0.6.0) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) offsite_payments (2.0.1) active_utils (~> 2.2.0) activesupport (>= 3.2.14, < 5.0.0) @@ -171,10 +177,10 @@ GEM money (< 7.0.0) nokogiri (~> 1.4) orm_adapter (0.5.0) - paperclip (4.2.1) - activemodel (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.3) + paperclip (4.2.4) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types paranoia (2.0.5) activerecord (~> 4.0) @@ -183,22 +189,23 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyamorous (1.1.0) + polyamorous (1.3.3) activerecord (>= 3.0) polyglot (0.3.5) - premailer (1.8.4) - css_parser (>= 1.3.6) + premailer (1.9.2) + css_parser (>= 1.4.8) htmlentities (>= 4.0.0) - premailer-rails (1.8.0) - actionmailer (>= 3, < 5) + premailer-rails (1.11.1) + actionmailer (>= 3) premailer (~> 1.7, >= 1.7.9) pry (0.9.12.6) coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) + public_suffix (2.0.5) rabl (0.9.4.pre1) activesupport (>= 2.3.14) - rack (1.5.2) + rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) rails (4.1.9) @@ -216,13 +223,15 @@ GEM activesupport (= 4.1.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) + rake (12.3.3) ransack (1.4.1) actionpack (>= 3.0) activerecord (>= 3.0) 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) @@ -297,35 +306,34 @@ GEM spree_core (= 2.4.6) spree_sample (2.4.6) spree_core (= 2.4.6) - sprockets (2.12.3) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) sqlite3 (1.3.9) state_machine (1.2.0) stringex (1.5.1) - thor (0.19.1) - thread_safe (0.3.5) + thor (0.20.3) + thread_safe (0.3.6) tilt (1.4.1) truncate_html (0.9.2) - twitter_cldr (3.1.2) + twitter_cldr (3.6.0) camertron-eprun - cldr-plurals-runtime-rb (~> 1.0.0) - json + cldr-plurals-runtime-rb (~> 1.0) tzinfo - tzinfo (1.2.2) + tzinfo (1.2.9) 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)