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/lib/action_view | |
| 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/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/template/handlers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb index 47e572967a..d9cddc0040 100644 --- a/actionpack/lib/action_view/template/handlers.rb +++ b/actionpack/lib/action_view/template/handlers.rb @@ -10,7 +10,7 @@ module ActionView #:nodoc: base.register_default_template_handler :erb, ERB.new base.register_template_handler :builder, Builder.new base.register_template_handler :raw, Raw.new - base.register_template_handler :rb, :source.to_proc + base.register_template_handler :ruby, :source.to_proc end @@template_handlers = {} |