Merged r14977 from trunk to 3.1-stable (#21569)

Request at least nokogiri 1.6.7.1 because of security advisories.

Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14991 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-12-21 04:17:49 +00:00
parent 9619aa9814
commit 9ded7d7db0

View File

@@ -15,6 +15,9 @@ gem "actionpack-action_caching"
gem "actionpack-xml_parser"
gem "loofah", "~> 2.0"
# Request at least nokogiri 1.6.7.1 because of security advisories
gem "nokogiri", ">= 1.6.7.1"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
gem "rbpdf", "~> 1.18.7"