From 46add754c09408ebddcb9fa635e84d0e5d1f61c9 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 19 Oct 2017 15:53:33 +0000 Subject: [PATCH] 3.2-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229) git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17016 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 047a59ee0..f1cae3e1f 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,9 @@ end gem "rails", "4.2.7.1" 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.0" gem "builder", ">= 3.0.4" -- 2.39.5