summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-01-09 16:40:13 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-01-09 16:40:13 +0000
commitcb8aaf1974652305f57cd7905c78ec55fa991614 (patch)
treedb5e95dfc674c7bd251114684b84876c782a9d97 /Gemfile
parentf905ee347b31a16891935c27b1c58fc938883df9 (diff)
downloadredmine-cb8aaf1974652305f57cd7905c78ec55fa991614.tar.gz
redmine-cb8aaf1974652305f57cd7905c78ec55fa991614.zip
Merged r16167 from trunk to 3.3-stable.
Gemfile: pin nokogiri version 1.6. nokogiri 1.7.0.1 requires Ruby version >= 2.1.0. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16168 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 260df0934..eeb275bf9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,8 +17,7 @@ gem "actionpack-xml_parser"
gem "roadie-rails"
gem "mimemagic"
-# Request at least nokogiri 1.6.7.2 because of security advisories
-gem "nokogiri", ">= 1.6.7.2"
+gem "nokogiri", "~> 1.6.8"
# Request at least rails-html-sanitizer 1.0.3 because of security advisories
gem "rails-html-sanitizer", ">= 1.0.3"