From: Toshi MARUYAMA Date: Tue, 26 Jan 2016 04:29:39 +0000 (+0000) Subject: Merged r15099 from trunk to 3.1-stable (#21843) X-Git-Tag: 3.1.4~16 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7030afc091c19c772c364fb9da71a0def028a6ee;p=redmine.git Merged r15099 from trunk to 3.1-stable (#21843) fix nokogiri version comment. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15101 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/Gemfile b/Gemfile index ad58e22b9..f5165f9d4 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem "actionpack-action_caching" gem "actionpack-xml_parser" gem "loofah", "~> 2.0" -# Request at least nokogiri 1.6.7.1 because of security advisories +# Request at least nokogiri 1.6.7.2 because of security advisories gem "nokogiri", ">= 1.6.7.2" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem