Commit fa2a2603 by Edward Zarecor

Merge pull request #181 from edx/e0d/update-nokogiri-1.6.7.2

updating nokogiri
parents bd47a000 b5887e73
...@@ -29,7 +29,7 @@ gem 'mongoid_magic_counter_cache' ...@@ -29,7 +29,7 @@ gem 'mongoid_magic_counter_cache'
gem 'will_paginate_mongoid', "~>2.0" gem 'will_paginate_mongoid', "~>2.0"
gem 'rdiscount' gem 'rdiscount'
gem 'nokogiri', "~>1.6.7.1" gem 'nokogiri', "~>1.6.7.2"
gem 'tire', "0.6.2" gem 'tire', "0.6.2"
gem 'tire-contrib' gem 'tire-contrib'
......
...@@ -91,7 +91,7 @@ GEM ...@@ -91,7 +91,7 @@ GEM
multi_json (1.11.2) multi_json (1.11.2)
netrc (0.10.3) netrc (0.10.3)
newrelic_rpm (3.13.2.302) newrelic_rpm (3.13.2.302)
nokogiri (1.6.7.1) nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2) mini_portile2 (~> 2.0.0.rc2)
origin (2.1.1) origin (2.1.1)
protected_attributes (1.1.3) protected_attributes (1.1.3)
...@@ -184,7 +184,7 @@ DEPENDENCIES ...@@ -184,7 +184,7 @@ DEPENDENCIES
mongoid-tree! mongoid-tree!
mongoid_magic_counter_cache mongoid_magic_counter_cache
newrelic_rpm newrelic_rpm
nokogiri (~> 1.6.7.1) nokogiri (~> 1.6.7.2)
protected_attributes protected_attributes
pry pry
pry-nav pry-nav
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment