From c880d877b8982132448999f13e3cf4258dcb906f Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 11 Feb 2016 14:31:31 -0500 Subject: [PATCH] Loosen Nokogiri version requirement Closes #13218 --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a13f49ad50e..9114fdd33ac 100644 --- a/Gemfile +++ b/Gemfile @@ -105,7 +105,7 @@ gem 'rouge', '~> 1.10.1' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM -gem 'nokogiri', '1.6.7.2' +gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' # Diffs gem 'diffy', '~> 3.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index df5099c7581..98a36724fe0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -959,7 +959,7 @@ DEPENDENCIES mysql2 (~> 0.3.16) nested_form (~> 0.3.2) net-ssh (~> 3.0.1) - nokogiri (= 1.6.7.2) + nokogiri (~> 1.6.7, >= 1.6.7.2) nprogress-rails (~> 0.1.6.7) oauth2 (~> 1.0.0) octokit (~> 3.8.0)