Merge branch 'rs-bump-nokogiri' into 'master'

Explicitly require Nokogiri 1.6.7.1 due to security issue ``` Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1 ``` See merge request !2154

Merge branch 'rs-bump-nokogiri' into 'master'
36026fb9 · Robert Speicher · 4156a37a · e5e44057 · 36026fb9 · 36026fb9
Commit 36026fb9 authored Dec 22, 2015 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Gemfile Gemfile +3 -0

Gemfile.lock Gemfile.lock +2 -1

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -102,6 +102,9 @@ gem 'wikicloth',     '0.8.1'
 gem 'asciidoctor',   '~> 1.5.2'
 gem 'rouge',         '~> 1.10.1'

+# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
+gem 'nokogiri', '1.6.7.1'
+
 # Diffs
 gem 'diffy', '~> 3.0.3'


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -420,7 +420,7 @@ GEM
      grape
      newrelic_rpm
    newrelic_rpm (3.9.4.245)
-    nokogiri (1.6.7)
+    nokogiri (1.6.7.1)
      mini_portile2 (~> 2.0.0.rc2)
    nprogress-rails (0.1.6.7)
    oauth (0.4.7)
@@ -892,6 +892,7 @@ DEPENDENCIES
  net-ssh (~> 3.0.1)
  newrelic-grape
  newrelic_rpm (~> 3.9.4.245)
+  nokogiri (= 1.6.7.1)
  nprogress-rails (~> 0.1.6.7)
  oauth2 (~> 1.0.0)
  octokit (~> 3.7.0)