From: Toshi MARUYAMA Date: Tue, 26 Jan 2016 11:45:41 +0000 (+0000) Subject: Merged r15105 from trunk to 3.2-stable. X-Git-Tag: 3.2.1~33 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f0c1d52bd15139dd1980547f84655c338467abc8;p=redmine.git Merged r15105 from trunk to 3.2-stable. request at least rails-html-sanitizer 1.0.3 because of security advisories. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15107 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/Gemfile b/Gemfile index eb63040bd..7a671177a 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,9 @@ gem "roadie-rails" # Request at least nokogiri 1.6.7.2 because of security advisories gem "nokogiri", ">= 1.6.7.2" +# Request at least rails-html-sanitizer 1.0.3 because of security advisories +gem "rails-html-sanitizer", ">= 1.0.3" + # 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"