Merged r14977 from trunk to 3.2-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.2-stable@14990 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-12-21 04:17:05 +00:00
parent 1560c9caa8
commit 072eec8851

View File

@@ -15,6 +15,9 @@ gem "actionpack-action_caching"
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"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
gem "rbpdf", "~> 1.19.0"