3.4-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229)

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17014 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 55170e41fd20634fdf98da7d5cec633c6e86b0d2..bd0bad4bb994e722ca2c6c6da662b6b2856fc635 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,9 @@ end
 
 gem "rails", "4.2.8"
 gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
-gem "public_suffix", "~> 2.0.5" if RUBY_VERSION < "2.1"
+if RUBY_VERSION < "2.1"
+  gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
+end
 gem "jquery-rails", "~> 3.1.4"
 gem "coderay", "~> 1.1.1"
 gem "request_store", "1.0.5"