diff options
| author | Oscar Del Ben <info@oscardelben.com> | 2012-04-21 12:18:19 +0200 |
|---|---|---|
| committer | Oscar Del Ben <info@oscardelben.com> | 2012-04-21 12:18:19 +0200 |
| commit | c06c842a8aec3e5ec9a6dc6379db8b27d64f7a03 (patch) | |
| tree | 79be9641c177367d214720f0944019b3aac5337a /actionpack | |
| parent | 3da2b530aff28d4ea0272e36578188bb6869cbcc (diff) | |
| parent | 63b4a0098be905d4a2a63c914277c48af5fe6b2e (diff) | |
| download | rails-c06c842a8aec3e5ec9a6dc6379db8b27d64f7a03.tar.gz rails-c06c842a8aec3e5ec9a6dc6379db8b27d64f7a03.tar.bz2 rails-c06c842a8aec3e5ec9a6dc6379db8b27d64f7a03.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index d4d09e2ee9..7985683a72 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -442,7 +442,7 @@ module ActionView # <video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video> # video_tag(["trailer.ogg", "trailer.flv"]) # => # <video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video> - # video_tag(["trailer.ogg", "trailer.flv"] :size => "160x120") # => + # video_tag(["trailer.ogg", "trailer.flv"], :size => "160x120") # => # <video height="120" width="160"><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video> def video_tag(*sources) multiple_sources_tag('video', sources) do |options| |