diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-10-19 15:53:33 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-10-19 15:53:33 +0000 |
| commit | 46add754c09408ebddcb9fa635e84d0e5d1f61c9 (patch) | |
| tree | caa0b3e10a881d0d40e35fe6a23b43e0a9ae78e7 | |
| parent | 66ba88ed3d1ace64a68b5626d269e55311ac7fbf (diff) | |
| download | redmine-46add754c09408ebddcb9fa635e84d0e5d1f61c9.tar.gz redmine-46add754c09408ebddcb9fa635e84d0e5d1f61c9.zip | |
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
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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" |