aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/url_helper.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-02-15 22:06:17 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-02-15 22:06:17 +0530
commit0c145448c42e811f9241e1634ecd2d60ddefff3a (patch)
treefb56c9870510de868250c4e027a11ebcead6e53f /actionpack/lib/action_view/helpers/url_helper.rb
parent520a16caad3d89da734c0f5bc14b8c16090f891f (diff)
parent2008fe606b6096e4b8ad9c03e03b0d11b94605cd (diff)
downloadrails-0c145448c42e811f9241e1634ecd2d60ddefff3a.tar.gz
rails-0c145448c42e811f9241e1634ecd2d60ddefff3a.tar.bz2
rails-0c145448c42e811f9241e1634ecd2d60ddefff3a.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: guides/source/upgrading_ruby_on_rails.md
Diffstat (limited to 'actionpack/lib/action_view/helpers/url_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 5e20b557d8..775d93ed39 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -241,13 +241,13 @@ module ActionView
# # </div>
# # </form>"
#
- # <%= button_to "New", action: "new", form_class: "new-thing" %>
+ # <%= button_to "New", { action: "new" }, form_class: "new-thing" %>
# # => "<form method="post" action="/controller/new" class="new-thing">
# # <div><input value="New" type="submit" /></div>
# # </form>"
#
#
- # <%= button_to "Create", action: "create", remote: true, form: { "data-type" => "json" } %>
+ # <%= button_to "Create", { action: "create" }, remote: true, form: { "data-type" => "json" } %>
# # => "<form method="post" action="/images/create" class="button_to" data-remote="true" data-type="json">
# # <div>
# # <input value="Create" type="submit" />