Unverified Commit 4b4685df by Alex Dusenbery Committed by GitHub

Merge pull request #251 from edx/EDUCATOR-232

EDUCATOR-232 | Upgrade nokogiri to 1.8.1
parents be949ce9 0645c82d
...@@ -31,7 +31,7 @@ gem 'mongoid_magic_counter_cache' ...@@ -31,7 +31,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.8" gem 'nokogiri', "~>1.8.1"
gem 'elasticsearch', '~> 1.1.2' gem 'elasticsearch', '~> 1.1.2'
gem 'elasticsearch-model', '~> 0.1.9' gem 'elasticsearch-model', '~> 0.1.9'
......
...@@ -103,7 +103,7 @@ GEM ...@@ -103,7 +103,7 @@ GEM
mime-types (3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mini_portile2 (2.1.0) mini_portile2 (2.3.0)
minitest (5.10.2) minitest (5.10.2)
mongo (2.1.2) mongo (2.1.2)
bson (~> 3.0) bson (~> 3.0)
...@@ -125,8 +125,8 @@ GEM ...@@ -125,8 +125,8 @@ GEM
nenv (0.3.0) nenv (0.3.0)
netrc (0.11.0) netrc (0.11.0)
newrelic_rpm (3.16.3.323) newrelic_rpm (3.16.3.323)
nokogiri (1.6.8.1) nokogiri (1.8.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.3.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
...@@ -235,7 +235,7 @@ DEPENDENCIES ...@@ -235,7 +235,7 @@ DEPENDENCIES
mongoid_cleaner (~> 1.2.0) mongoid_cleaner (~> 1.2.0)
mongoid_magic_counter_cache mongoid_magic_counter_cache
newrelic_rpm newrelic_rpm
nokogiri (~> 1.6.8) nokogiri (~> 1.8.1)
protected_attributes protected_attributes
pry pry
pry-nav pry-nav
...@@ -257,4 +257,4 @@ DEPENDENCIES ...@@ -257,4 +257,4 @@ DEPENDENCIES
yajl-ruby yajl-ruby
BUNDLED WITH BUNDLED WITH
1.15.2 1.16.0
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