diff --git a/Gemfile b/Gemfile index 8fd4ea71525..43e88709a5e 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem 'mongoid_magic_counter_cache' gem 'will_paginate_mongoid', "~>2.0" gem 'rdiscount' -gem 'nokogiri', "~>1.6.7.2" +gem 'nokogiri', "~>1.6.8" gem 'tire', "0.6.2" gem 'tire-contrib' diff --git a/Gemfile.lock b/Gemfile.lock index 8a7a04517d0..25bc151cdac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM listen (0.5.0) method_source (0.8) mime-types (2.6.1) - mini_portile2 (2.0.0) + mini_portile2 (2.1.0) minitest (5.8.1) mongo (2.1.1) bson (~> 3.0) @@ -91,9 +91,11 @@ GEM multi_json (1.11.2) netrc (0.10.3) newrelic_rpm (3.15.0.314) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) origin (2.1.1) + pkg-config (1.1.7) protected_attributes (1.1.3) activemodel (>= 4.0.1, < 5.0) pry (0.9.10) @@ -184,7 +186,7 @@ DEPENDENCIES mongoid-tree! mongoid_magic_counter_cache newrelic_rpm - nokogiri (~> 1.6.7.2) + nokogiri (~> 1.6.8) protected_attributes pry pry-nav @@ -202,6 +204,3 @@ DEPENDENCIES unicorn will_paginate_mongoid (~> 2.0) yajl-ruby - -BUNDLED WITH - 1.11.2