Merged r15096 from trunk to 3.2-stable (#21843)

Request at least nokogiri 1.6.7.2 because of security advisories.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15097 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2016-01-26 04:18:45 +00:00
parent 253202c4af
commit 3215633744

View File

@@ -16,7 +16,7 @@ gem "actionpack-xml_parser"
gem "roadie-rails"
# Request at least nokogiri 1.6.7.1 because of security advisories
gem "nokogiri", ">= 1.6.7.1"
gem "nokogiri", ">= 1.6.7.2"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]