diff --git a/Gemfile b/Gemfile index 413ee03..f8795b4 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem 'spring', group: :development gem 'twitter-bootstrap-rails' -gem 'devise' +gem 'devise', '>= 4.6.0' gem 'rails_12factor', group: :production diff --git a/Gemfile.lock b/Gemfile.lock index 99b74f0..c6d7411 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,8 +33,8 @@ GEM aws-sdk-v1 (1.66.0) json (~> 1.4) nokogiri (>= 1.4.4) - bcrypt (3.1.10) - builder (3.2.2) + bcrypt (3.1.12) + builder (3.2.3) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.7) @@ -46,12 +46,12 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - devise (3.5.2) + concurrent-ruby (1.1.5) + devise (4.6.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 6.0) responders - thread_safe (~> 0.1) warden (~> 1.2.3) erubis (2.7.0) execjs (2.6.0) @@ -61,7 +61,8 @@ GEM haml (4.0.7) tilt hike (1.2.3) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (2.3.2) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) @@ -70,7 +71,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (1.8.6) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -80,7 +81,7 @@ GEM mime-types (2.6.2) mimemagic (0.3.0) mini_portile (0.6.2) - minitest (5.8.1) + minitest (5.11.3) multi_json (1.11.2) nested_form (0.3.2) nokogiri (1.6.6.2) @@ -133,7 +134,7 @@ GEM activesupport (= 4.1.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) + rake (12.3.2) rdoc (4.2.0) ref (2.0.0) remotipart (1.2.1) @@ -162,8 +163,8 @@ GEM therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thor (0.19.1) - thread_safe (0.3.5) + thor (0.20.3) + thread_safe (0.3.6) tilt (1.4.1) turbolinks (2.5.3) coffee-rails @@ -172,12 +173,12 @@ GEM execjs (~> 2.2) rails (~> 4.1) railties (~> 4.1) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - warden (1.2.3) + warden (1.2.7) rack (>= 1.0) PLATFORMS @@ -186,7 +187,7 @@ PLATFORMS DEPENDENCIES aws-sdk (< 2.0) coffee-rails (~> 4.0.0) - devise + devise (>= 4.6.0) geocoder jbuilder (~> 2.0) jquery-rails @@ -205,4 +206,4 @@ DEPENDENCIES uglifier (>= 1.3.0) BUNDLED WITH - 1.10.6 + 1.17.3