diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-12-21 04:17:49 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-12-21 04:17:49 +0000 |
| commit | 9ded7d7db09641e905bba353113be472c206915e (patch) | |
| tree | a34d82354cc58f7049bda0baa4a887e31b33c89c | |
| parent | 9619aa98147cbb91c2650bc1eb08f2964a1bddd9 (diff) | |
| download | redmine-9ded7d7db09641e905bba353113be472c206915e.tar.gz redmine-9ded7d7db09641e905bba353113be472c206915e.zip | |
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
| -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 "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" |