diff --git a/Gemfile.lock b/Gemfile.lock index 102d539..e036195 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,8 +28,8 @@ GEM thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) - bcrypt (3.1.9) - builder (3.2.2) + bcrypt (3.1.13) + builder (3.2.3) capistrano (3.2.1) i18n rake (>= 10.0.0) @@ -52,12 +52,12 @@ GEM coffee-script-source (1.8.0) colorize (0.7.3) commonjs (0.2.7) - devise (3.4.1) + concurrent-ruby (1.1.5) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0) responders - thread_safe (~> 0.1) warden (~> 1.2.3) erubis (2.7.0) execjs (2.2.2) @@ -68,14 +68,15 @@ GEM httparty (0.13.3) json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (2.2.6) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.2) + json (1.8.6) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -88,7 +89,7 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) - minitest (5.5.1) + minitest (5.12.0) multi_json (1.10.1) multi_xml (0.5.5) net-scp (1.2.1) @@ -98,7 +99,7 @@ GEM orm_adapter (0.5.0) polyamorous (1.1.0) activerecord (>= 3.0) - rack (1.5.2) + rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) rails (4.1.6) @@ -116,7 +117,7 @@ GEM activesupport (= 4.1.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) + rake (12.3.3) ransack (1.6.2) actionpack (>= 3.0) activerecord (>= 3.0) @@ -154,8 +155,8 @@ GEM therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.19.1) - thread_safe (0.3.4) + thor (0.20.3) + thread_safe (0.3.6) tilt (1.4.1) turbolinks (2.5.3) coffee-rails @@ -164,12 +165,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.0) execjs (>= 0.3.0) json (>= 1.8.0) - warden (1.2.3) + warden (1.2.7) rack (>= 1.0) will_paginate (3.0.7) zeroclipboard-rails (0.1.1)