diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-12-21 04:17:05 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-12-21 04:17:05 +0000 |
| commit | 072eec8851f95e1eeebe5ebdbe8a1d14151a6d97 (patch) | |
| tree | 90d652d8a7bb09ccba177198a66d2f6233c8f875 /Gemfile | |
| parent | 1560c9caa8f1538bd0e7bdae2a68b3a048f8c6db (diff) | |
| download | redmine-072eec8851f95e1eeebe5ebdbe8a1d14151a6d97.tar.gz redmine-072eec8851f95e1eeebe5ebdbe8a1d14151a6d97.zip | |
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
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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" |