diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-11-16 00:33:14 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-16 09:59:15 -0200 |
| commit | 666a7e34f553cef4c8878362eafc79c7e3f310c3 (patch) | |
| tree | 85ed6e0dd3a97e1d70ecce0b13e528c034f98046 /activerecord/test/cases/locking_test.rb | |
| parent | f2a98a9243a3eb078efa11b901a6b6446e89717e (diff) | |
| download | rails-666a7e34f553cef4c8878362eafc79c7e3f310c3.tar.gz rails-666a7e34f553cef4c8878362eafc79c7e3f310c3.tar.bz2 rails-666a7e34f553cef4c8878362eafc79c7e3f310c3.zip | |
Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext
Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`
Conflicts:
actionpack/CHANGELOG.md
actionpack/test/template/template_test.rb
Diffstat (limited to 'activerecord/test/cases/locking_test.rb')
0 files changed, 0 insertions, 0 deletions