summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-06-25 08:37:04 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-06-25 08:37:04 +0000
commit9365fd97ef809132f59b69254bddc8c235379a5a (patch)
treea231abd3c12eeeccf13e965aa28b00f0432ee3bc /Gemfile
parentba9909aa5d18d12cdf5e1b5ddd86d4fe1fa37d67 (diff)
downloadredmine-9365fd97ef809132f59b69254bddc8c235379a5a.tar.gz
redmine-9365fd97ef809132f59b69254bddc8c235379a5a.zip
Merged r16676 (#26183).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16683 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 230dd7a22..e25ff93bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem "roadie-rails", "~> 1.1.1"
gem "roadie", "~> 3.2.1"
gem "mimemagic"
-gem "nokogiri", "~> 1.6.8"
+gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
gem "i18n", "~> 0.7.0"
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"