From c1ebff35de4261055bf6ae77837e5c13fa1627a3 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sat, 10 Jun 2017 11:35:36 +0900 Subject: [PATCH] Use nokogiri 1.6.x on Ruby 2.0 `nokogiri` 1.7 requires Ruby version >= 2.1.0. Therefore, lock the version. --- gemfiles/Gemfile-rails-4-2 | 1 + gemfiles/Gemfile-sass-3-1 | 1 + gemfiles/Gemfile-sass-3-2 | 1 + gemfiles/Gemfile-sass-3-3 | 1 + gemfiles/Gemfile-sass-3-4 | 1 + gemfiles/Gemfile-sprockets-2-11 | 1 + gemfiles/Gemfile-sprockets-2-12 | 1 + gemfiles/Gemfile-sprockets-2-8 | 1 + gemfiles/Gemfile-sprockets-3-0 | 1 + gemfiles/Gemfile-sprockets-4-0 | 1 + gemfiles/Gemfile-sprockets-rails-2-2 | 1 + gemfiles/Gemfile-sprockets-rails-master | 1 + 12 files changed, 12 insertions(+) diff --git a/gemfiles/Gemfile-rails-4-2 b/gemfiles/Gemfile-rails-4-2 index d12f9a4..08ed377 100644 --- a/gemfiles/Gemfile-rails-4-2 +++ b/gemfiles/Gemfile-rails-4-2 @@ -7,3 +7,4 @@ gem "rails", "~> 4.2.0" gem "sass", "~> 3.3.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sass-3-1 b/gemfiles/Gemfile-sass-3-1 index 7adb13b..14a734b 100644 --- a/gemfiles/Gemfile-sass-3-1 +++ b/gemfiles/Gemfile-sass-3-1 @@ -7,3 +7,4 @@ gem "rails" gem "sass", "~> 3.1.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sass-3-2 b/gemfiles/Gemfile-sass-3-2 index 3aaae9e..706cd4e 100644 --- a/gemfiles/Gemfile-sass-3-2 +++ b/gemfiles/Gemfile-sass-3-2 @@ -7,3 +7,4 @@ gem "rails" gem "sass", "~> 3.2.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sass-3-3 b/gemfiles/Gemfile-sass-3-3 index 92f3fb6..95f3a51 100644 --- a/gemfiles/Gemfile-sass-3-3 +++ b/gemfiles/Gemfile-sass-3-3 @@ -7,3 +7,4 @@ gem "rails" gem "sass", "~> 3.3.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sass-3-4 b/gemfiles/Gemfile-sass-3-4 index e564171..8a46884 100644 --- a/gemfiles/Gemfile-sass-3-4 +++ b/gemfiles/Gemfile-sass-3-4 @@ -7,3 +7,4 @@ gem "rails" gem "sass", "~> 3.4.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sprockets-2-11 b/gemfiles/Gemfile-sprockets-2-11 index 98e3a4c..79eda74 100644 --- a/gemfiles/Gemfile-sprockets-2-11 +++ b/gemfiles/Gemfile-sprockets-2-11 @@ -8,3 +8,4 @@ gem "sprockets", "~> 2.11.0" gem "sass", "~> 3.3.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sprockets-2-12 b/gemfiles/Gemfile-sprockets-2-12 index 51126ae..0e0ad94 100644 --- a/gemfiles/Gemfile-sprockets-2-12 +++ b/gemfiles/Gemfile-sprockets-2-12 @@ -8,3 +8,4 @@ gem "sprockets", "~> 2.12.0" gem "sass", "~> 3.3.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sprockets-2-8 b/gemfiles/Gemfile-sprockets-2-8 index 2d7eb51..947440d 100644 --- a/gemfiles/Gemfile-sprockets-2-8 +++ b/gemfiles/Gemfile-sprockets-2-8 @@ -8,3 +8,4 @@ gem "sprockets", "~> 2.8.0" gem "sass", "~> 3.3.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sprockets-3-0 b/gemfiles/Gemfile-sprockets-3-0 index b875023..2bc6258 100644 --- a/gemfiles/Gemfile-sprockets-3-0 +++ b/gemfiles/Gemfile-sprockets-3-0 @@ -8,3 +8,4 @@ gem "sprockets", "~> 3.0.0" gem "sass", "~> 3.3.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sprockets-4-0 b/gemfiles/Gemfile-sprockets-4-0 index 0d8841c..da6d9cb 100644 --- a/gemfiles/Gemfile-sprockets-4-0 +++ b/gemfiles/Gemfile-sprockets-4-0 @@ -7,3 +7,4 @@ gem "rails" gem "sprockets", "~> 4.x" gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9') gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sprockets-rails-2-2 b/gemfiles/Gemfile-sprockets-rails-2-2 index f40ba3f..c4ea2dd 100644 --- a/gemfiles/Gemfile-sprockets-rails-2-2 +++ b/gemfiles/Gemfile-sprockets-rails-2-2 @@ -8,3 +8,4 @@ gem "sprockets-rails", "~> 2.2.0" gem "sass", "~> 3.3.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1") diff --git a/gemfiles/Gemfile-sprockets-rails-master b/gemfiles/Gemfile-sprockets-rails-master index dd169bd..d0ca96d 100644 --- a/gemfiles/Gemfile-sprockets-rails-master +++ b/gemfiles/Gemfile-sprockets-rails-master @@ -8,3 +8,4 @@ gem "sprockets-rails", github: "rails/sprockets-rails" gem "sass", "~> 3.3.0" gem "mime-types", "< 2" gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2") +gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")