summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-26 11:47:59 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-26 11:47:59 +0000
commit8136057a67a7cefd914be5d1a81f64ad85a833f3 (patch)
tree878b761d65022cfe355c409cbff900343f265128 /Gemfile
parent68d75af0ae53d1b2ccd9a073816c5c83e3b7c790 (diff)
downloadredmine-8136057a67a7cefd914be5d1a81f64ad85a833f3.tar.gz
redmine-8136057a67a7cefd914be5d1a81f64ad85a833f3.zip
Merged r15105 from trunk to 3.1-stable.
request at least rails-html-sanitizer 1.0.3 because of security advisories. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15109 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index a096e25fc..0b8de623c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,9 @@ gem "loofah", "~> 2.0"
# 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.18.7"