diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-01-26 04:18:45 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-01-26 04:18:45 +0000 |
| commit | 3215633744fe1d4dfd8b32f0ee449fae85913889 (patch) | |
| tree | 6fcd147815910939f5c48c981087aa70e5b9f0d8 /Gemfile | |
| parent | 253202c4af17c03e53e27db12c3db2b97a65c266 (diff) | |
| download | redmine-3215633744fe1d4dfd8b32f0ee449fae85913889.tar.gz redmine-3215633744fe1d4dfd8b32f0ee449fae85913889.zip | |
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
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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] |