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
This commit is contained in:
Toshi MARUYAMA
2017-01-09 16:40:13 +00:00
parent f905ee347b
commit cb8aaf1974

View File

@@ -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"