diff --git a/Gemfile b/Gemfile index d9878e7ba..606274638 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem "redis-objects", "0.5.2" gem "redcarpet", "~> 2.0.0" gem "pygments.rb" # HTML 处理 -gem "nokogiri", "1.5.0" +gem "nokogiri", "1.13.9" gem "hpricot" gem "jquery-rails", "1.0.16" # Auto link @@ -97,7 +97,7 @@ end group :mailman do gem "rb-inotify" gem "mailman" - gem "nokogiri", "1.5.0" + gem "nokogiri", "1.13.9" gem "daemon-spawn", "~> 0.4.2" gem "resque", :require => "resque/server" end diff --git a/Gemfile.lock b/Gemfile.lock index f34f7ac5a..7920c0801 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,6 +191,7 @@ GEM mime-types (1.19) mini_magick (3.3) subexec (~> 0.1.0) + mini_portile2 (2.8.0) mover (0.3.6) multi_json (1.0.4) multipart-post (1.1.4) @@ -204,7 +205,9 @@ GEM net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) newrelic_rpm (3.3.0) - nokogiri (1.5.0) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) oauth (0.4.5) oauth2 (0.5.1) faraday (~> 0.7.4) @@ -239,6 +242,7 @@ GEM options (~> 2.3.0) pygments.rb (0.2.4) rubypython (~> 0.5.3) + racc (1.6.0) rack (1.4.3) rack-cache (1.2) rack (>= 0.4) @@ -314,8 +318,8 @@ GEM rubypython (0.5.3) blankslate (>= 2.1.2.3) ffi (~> 1.0.7) - sanitize (2.0.3) - nokogiri (>= 1.4.4, < 1.6) + sanitize (2.0.6) + nokogiri (>= 1.4.4) sass (3.1.11) sass-rails (3.2.4) railties (~> 3.2.0) @@ -390,7 +394,7 @@ DEPENDENCIES mini_magick (= 3.3) mysql2 newrelic_rpm - nokogiri (= 1.5.0) + nokogiri (= 1.13.9) omniauth (~> 1.0.1) omniauth-douban! omniauth-github (~> 1.0.0)