aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-20 19:11:04 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-20 19:11:04 -0200
commit030c0532b9eaeabffc17bda116125987c6df32f6 (patch)
treeabd6516cd7291169391b3c37ece376cecc21018f /actionpack/lib
parent8ed5b46ce65db067eb583e902f851a1f60f5b406 (diff)
parentbc43d7f57d99a6f691761aceb3f399ba3ac7bace (diff)
downloadrails-030c0532b9eaeabffc17bda116125987c6df32f6.tar.gz
rails-030c0532b9eaeabffc17bda116125987c6df32f6.tar.bz2
rails-030c0532b9eaeabffc17bda116125987c6df32f6.zip
Merge pull request #17688 from ilyakatz/request_method_instrumentation
Use request_method instead of method in instrumentation
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/instrumentation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index b0e164bc57..bef7545e71 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -21,7 +21,7 @@ module ActionController
:action => self.action_name,
:params => request.filtered_parameters,
:format => request.format.try(:ref),
- :method => request.method,
+ :method => request.request_method,
:path => (request.fullpath rescue "unknown")
}