diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:51:13 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:51:13 -0300 |
| commit | cdc00aba62ffb0f0af452f5152aafeb5e490962e (patch) | |
| tree | 071ca4766dd07b9af34bbebf902c50a27c5c2b4d /railties/lib/rails | |
| parent | cc9091c3e719facd0f73c8ab425a5bb9a7d0a65b (diff) | |
| parent | c78da4d5c472f7254ed609ef753d7b1719732802 (diff) | |
| download | rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.tar.gz rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.tar.bz2 rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.zip | |
Merge branch 'loofah'
Conflicts:
Gemfile
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index d6311829fa..337f4dd6c1 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -15,6 +15,11 @@ source 'https://rubygems.org' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' +# Use Rails Html Sanitizer for HTML sanitization +gem 'rails-html-snaitizer', github: 'rails/rails', branch: 'master' +#temporary gem until a new version of loofah is released +gem 'loofah', github: 'kaspth/loofah', branch: 'single-scrub' + # Use Unicorn as the app server # gem 'unicorn' |