diff --git a/Gemfile.lock b/Gemfile.lock index 048db63..b11b85b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,7 +32,7 @@ GEM arel (~> 6.0) activesupport (4.2.6) i18n (~> 0.7) - json (~> 1.8.5) + json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) @@ -44,7 +44,7 @@ GEM bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - builder (3.2.2) + builder (3.2.4) byebug (9.0.5) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -53,15 +53,17 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) + concurrent-ruby (1.1.9) + crass (1.0.6) debug_inspector (0.0.2) erubis (2.7.0) execjs (2.7.0) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.2) + activesupport (>= 4.2.0) haml (4.0.7) tilt - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) innertube (1.1.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) @@ -73,23 +75,24 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.5) - loofah (2.0.3) - nokogiri (~> 1.8.5) + loofah (2.14.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) mail (2.6.4) mime-types (>= 1.16, < 4) middleware (0.1.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) - minitest (5.9.0) + mini_portile2 (2.8.0) + minitest (5.15.0) multi_json (1.12.1) mysql2 (0.4.5) - nokogiri (1.8.5) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - pkg-config (1.1.7) - rack (1.6.4) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + racc (1.6.0) + rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) rails (4.2.6) @@ -103,14 +106,14 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.6) sprockets-rails - rails-deprecated_sanitizer (1.0.3) + rails-deprecated_sanitizer (1.0.4) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.8.5) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.4.2) + loofah (~> 2.3) railties (4.2.6) actionpack (= 4.2.6) activesupport (= 4.2.6) @@ -131,10 +134,10 @@ GEM json (~> 1.8.5) rdoc (~> 4.0) spring (1.7.2) - sprockets (3.7.0) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -146,12 +149,12 @@ GEM middleware (>= 0.1.0) riddle (>= 1.5.11) thor (0.19.1) - thread_safe (0.3.5) + thread_safe (0.3.6) tilt (2.0.5) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.0) - tzinfo (1.2.2) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (3.0.1) execjs (>= 0.3.0, < 3) @@ -171,6 +174,7 @@ DEPENDENCIES haml jbuilder (~> 2.0) jquery-rails + json (~> 1.8.5) mysql2 rails (= 4.2.6) sass-rails (~> 5.0)