From fe98cfde3a51ed433044ad9ad93c204b8760c247 Mon Sep 17 00:00:00 2001 From: Dan Rice Date: Wed, 15 Oct 2014 20:54:17 -0400 Subject: [PATCH] Pin gems for Ruby 1.8.7 compatibility * sanitize 2.0.3 * nokogiri ~>1.5.11 * rails_autolink ~>1.0.0 --- Gemfile | 5 +++-- Gemfile.lock | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index c8cde08d..464800b6 100644 --- a/Gemfile +++ b/Gemfile @@ -10,13 +10,14 @@ gem "mysql2", "~>0.3" gem "RedCloth", "~>4.2.9" gem "formatize", "~>1.1" -gem "sanitize", "~>2.0" +gem "sanitize", "2.0.3" +gem "nokogiri", "~>1.5.11" gem "will_paginate", "~>3.0" gem "acts_as_list", "~>0.3.0" gem "aasm", "~>3.0" gem "htmlentities", "~>4.3" gem "swf_fu", "~>2.0" -gem "rails_autolink", "~>1.0" +gem "rails_autolink", "~>1.0.0" gem "cache_digests", :path => 'vendor/gems/cache_digests-0.1.0' # vendored for Ruby 1.8.7 compatibility gem "rack-mini-profiler", "~>0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 50605717..113384d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,12 +108,10 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - mini_portile (0.6.0) multi_json (1.10.1) multi_test (0.1.1) mysql2 (0.3.16) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + nokogiri (1.5.11) polyglot (0.3.5) rack (1.4.5) rack-cache (1.2) @@ -132,8 +130,8 @@ GEM activesupport (= 3.2.19) bundler (~> 1.0) railties (= 3.2.19) - rails_autolink (1.1.5) - rails (> 3.1) + rails_autolink (1.0.9) + rails (~> 3.1) railties (3.2.19) actionpack (= 3.2.19) activesupport (= 3.2.19) @@ -149,8 +147,9 @@ GEM diff-lcs (>= 1.1.3, < 2.0) rubyzip (1.1.3) safe_yaml (0.9.7) - sanitize (2.1.0) - nokogiri (>= 1.4.4) + sanitize (2.0.3) + nokogiri (>= 1.4.4, < 1.6) + nokogiri (>= 1.4.4, < 1.6) sass (3.3.7) sass-rails (3.2.6) railties (~> 3.2.0) @@ -218,10 +217,11 @@ DEPENDENCIES htmlentities (~> 4.3) jquery-rails (~> 2.1) mysql2 (~> 0.3) + nokogiri (~> 1.5.11) rack-mini-profiler (~> 0.1) rails (~> 3.2.19) - rails_autolink (~> 1.0) - sanitize (~> 2.0) + rails_autolink (~> 1.0.0) + sanitize (= 2.0.3) sass-rails (~> 3.2) selenium-webdriver (~> 2.27) simplecov (~> 0.7)