diff --git a/Gemfile b/Gemfile index d9437ee2..6bc0a8e1 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ end group :docs do gem 'typhoeus' - gem 'nokogiri', '1.6.7.rc3' + gem 'nokogiri' gem 'html-pipeline' gem 'progress_bar', require: false gem 'unix_utils', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 9361ac11..29f0eb2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,12 +12,13 @@ GEM coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) - browser (1.0.1) + browser (1.1.0) coderay (1.1.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) + concurrent-ruby (1.0.0) daemons (1.2.3) erubis (2.7.0) ethon (0.8.0) @@ -32,11 +33,11 @@ GEM i18n (0.7.0) json (1.8.3) method_source (0.8.2) - mini_portile (0.7.0.rc4) + mini_portile2 (2.0.0) minitest (5.8.3) multi_json (1.11.2) - nokogiri (1.6.7.rc3) - mini_portile (~> 0.7.0.rc4) + nokogiri (1.6.7.1) + mini_portile2 (~> 2.0.0.rc2) options (2.3.2) progress_bar (1.0.5) highline (~> 1.6) @@ -52,7 +53,7 @@ GEM rack (>= 1.0) rake (10.4.2) rr (1.1.2) - sass (3.4.19) + sass (3.4.20) sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) @@ -65,7 +66,8 @@ GEM sinatra (~> 1.4.0) tilt (>= 1.3, < 3) slop (3.6.0) - sprockets (3.4.0) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-helpers (1.2.1) sprockets (>= 2.2) @@ -75,7 +77,7 @@ GEM rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.1) + tilt (2.0.2) typhoeus (0.8.0) ethon (>= 0.8.0) tzinfo (1.2.2) @@ -97,7 +99,7 @@ DEPENDENCIES erubis html-pipeline minitest - nokogiri (= 1.6.7.rc3) + nokogiri progress_bar pry (~> 0.10.0) rack