Merge pull request #1037 from rishabhs95/hakiri-nokogiri

update nokogiri gem for hakiri issue
This commit is contained in:
Henne Vogelsang 2016-06-15 16:55:51 +02:00 committed by GitHub
commit 0d6199058f

View file

@ -254,7 +254,7 @@ GEM
open4 (~> 1.3.4)
rake
mini_magick (4.5.1)
mini_portile2 (2.0.0)
mini_portile2 (2.1.0)
minitest (5.9.0)
momentjs-rails (2.8.1)
railties (>= 3.1)
@ -274,8 +274,9 @@ GEM
mysql2 (0.4.2)
netrc (0.11.0)
nio4r (1.2.1)
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)
oauth2 (0.9.4)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
@ -315,6 +316,7 @@ GEM
actionpack
activesupport
rails (>= 3.0.0)
pkg-config (1.1.7)
poltergeist (1.9.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
@ -618,3 +620,6 @@ DEPENDENCIES
web-console (~> 2.0)
webmock
whenever
BUNDLED WITH
1.12.5