aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-02-22 12:39:21 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-02-22 12:39:21 -0300
commit1bc98b11f5c471c54453e196942bd88bcc704c90 (patch)
tree043c6de839ed2fd1f5c59df78a8ac0e291bdc9f4 /actionview/lib/action_view
parentaa3d4408716a2470f85d8e0443cbc7a4ce1ff53d (diff)
parent2b4c0ae144768d72f042b2c2ec1bca4df386fb6f (diff)
downloadrails-1bc98b11f5c471c54453e196942bd88bcc704c90.tar.gz
rails-1bc98b11f5c471c54453e196942bd88bcc704c90.tar.bz2
rails-1bc98b11f5c471c54453e196942bd88bcc704c90.zip
Merge pull request #23752 from vipulnsward/23524-fix-button_to_delete
Fixed passing of delete method on button_to tag, creating wrong form csrf token
Diffstat (limited to 'actionview/lib/action_view')
-rw-r--r--actionview/lib/action_view/helpers/url_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb
index 87218821ed..234e489115 100644
--- a/actionview/lib/action_view/helpers/url_helper.rb
+++ b/actionview/lib/action_view/helpers/url_helper.rb
@@ -312,7 +312,7 @@ module ActionView
form_options[:'data-remote'] = true if remote
request_token_tag = if form_method == 'post'
- token_tag(nil, form_options: form_options)
+ token_tag(nil, form_options: form_options.merge(method: method))
else
''
end