summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-26 11:45:41 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-26 11:45:41 +0000
commitf0c1d52bd15139dd1980547f84655c338467abc8 (patch)
treebb5b292fd8df6ee1cd3f82398fc139a272379042 /Gemfile
parent604b3472d418ecee5299285318fafb79d19a7fa4 (diff)
downloadredmine-f0c1d52bd15139dd1980547f84655c338467abc8.tar.gz
redmine-f0c1d52bd15139dd1980547f84655c338467abc8.zip
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 3 insertions, 0 deletions
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"