Skip to content

Commit

Permalink
Merge pull request #181 from edx/e0d/update-nokogiri-1.6.7.2
Browse files Browse the repository at this point in the history
updating nokogiri
  • Loading branch information
Edward Zarecor committed Jan 25, 2016
2 parents bd47a00 + b5887e7 commit fa2a260
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ gem 'mongoid_magic_counter_cache'

gem 'will_paginate_mongoid', "~>2.0"
gem 'rdiscount'
gem 'nokogiri', "~>1.6.7.1"
gem 'nokogiri', "~>1.6.7.2"

gem 'tire', "0.6.2"
gem 'tire-contrib'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ GEM
multi_json (1.11.2)
netrc (0.10.3)
newrelic_rpm (3.13.2.302)
nokogiri (1.6.7.1)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
origin (2.1.1)
protected_attributes (1.1.3)
Expand Down Expand Up @@ -184,7 +184,7 @@ DEPENDENCIES
mongoid-tree!
mongoid_magic_counter_cache
newrelic_rpm
nokogiri (~> 1.6.7.1)
nokogiri (~> 1.6.7.2)
protected_attributes
pry
pry-nav
Expand Down

0 comments on commit fa2a260

Please sign in to comment.