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 eb63040bdce9976f494b875f53ed4e3b628c2177..7a671177add75bd24d88c1db7feb25962a2aa6b3 100644 (file)
--- 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"