diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-09-17 08:13:08 -0700 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-09-17 08:13:08 -0700 |
commit | a2194990fa68ca1d1102da4fcd46e29bff34b1ae (patch) | |
tree | 1afc4746271d1b59cb09127c20abe217e34370f5 /actionpack/CHANGELOG.md | |
parent | d9f936e61b15ae163e92ca92822b242baeec986d (diff) | |
parent | de1060f4e02925c12004f2ae4dd3f28cdb6a8e04 (diff) | |
download | rails-a2194990fa68ca1d1102da4fcd46e29bff34b1ae.tar.gz rails-a2194990fa68ca1d1102da4fcd46e29bff34b1ae.tar.bz2 rails-a2194990fa68ca1d1102da4fcd46e29bff34b1ae.zip |
Merge pull request #7669 from guilleiguaran/rename-rb-handler
Rename .rb template handler to .ruby to avoid conflicts with mustache classes
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r-- | actionpack/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 339b4197df..f9af8934fd 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -33,7 +33,7 @@ *Sergey Nartimov* -* Add .rb template handler, this handler simply allows arbitrary Ruby code as a template. *Guillermo Iguaran* +* Add .ruby template handler, this handler simply allows arbitrary Ruby code as a template. *Guillermo Iguaran* * Add `separator` option for `ActionView::Helpers::TextHelper#excerpt`: |