From f0c7b5de1aaadff9e9b916630226a83f8194d108 Mon Sep 17 00:00:00 2001 From: Sascha Korth Date: Tue, 14 Jan 2014 16:53:03 +0100 Subject: [PATCH 1/3] Update Nokogiri version --- Gemfile.1.8.7 | 2 +- fog.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.1.8.7 b/Gemfile.1.8.7 index 216787ceb..9210c4b2a 100644 --- a/Gemfile.1.8.7 +++ b/Gemfile.1.8.7 @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem 'nokogiri', '~>1.5.0' +gem 'nokogiri', '~>1.5.11' gem 'mime-types', '~>1.16' group :development, :test do diff --git a/fog.gemspec b/fog.gemspec index 493a18db6..fb616ca42 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -48,7 +48,7 @@ Gem::Specification.new do |s| s.add_dependency('mime-types') s.add_dependency('net-scp', '~>1.1') s.add_dependency('net-ssh', '>=2.1.3') - s.add_dependency('nokogiri', '~>1.5') + s.add_dependency('nokogiri', '~>1.5.11') ## List your development dependencies here. Development dependencies are ## those that are only needed during development From da59fa251122cd312c822d9ff7ad012be35f7655 Mon Sep 17 00:00:00 2001 From: Sascha Korth Date: Thu, 16 Jan 2014 16:48:45 +0100 Subject: [PATCH 2/3] Fix version --- Gemfile.1.8.7 | 2 +- fog.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.1.8.7 b/Gemfile.1.8.7 index 9210c4b2a..9d1f1e4f5 100644 --- a/Gemfile.1.8.7 +++ b/Gemfile.1.8.7 @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem 'nokogiri', '~>1.5.11' +gem 'nokogiri', '>=1.5.11' gem 'mime-types', '~>1.16' group :development, :test do diff --git a/fog.gemspec b/fog.gemspec index fb616ca42..630b51e96 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -48,7 +48,7 @@ Gem::Specification.new do |s| s.add_dependency('mime-types') s.add_dependency('net-scp', '~>1.1') s.add_dependency('net-ssh', '>=2.1.3') - s.add_dependency('nokogiri', '~>1.5.11') + s.add_dependency('nokogiri', '>=1.5.11') ## List your development dependencies here. Development dependencies are ## those that are only needed during development From b45c0515a6ead03f4d1a859e37cf72e625c70087 Mon Sep 17 00:00:00 2001 From: Sascha Korth Date: Thu, 16 Jan 2014 17:39:03 +0100 Subject: [PATCH 3/3] Undo last nokogiri version setting --- Gemfile.1.8.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.1.8.7 b/Gemfile.1.8.7 index 9d1f1e4f5..9210c4b2a 100644 --- a/Gemfile.1.8.7 +++ b/Gemfile.1.8.7 @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem 'nokogiri', '>=1.5.11' +gem 'nokogiri', '~>1.5.11' gem 'mime-types', '~>1.16' group :development, :test do