diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-02 19:21:03 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-02 19:21:03 -0500 |
| commit | b359f9fe7cc3f664e145fae7b0d5b5c309587ef8 (patch) | |
| tree | 386bac9ca264c2355741ba967334030f518b73fa /actionpack/lib/action_controller/metal/instrumentation.rb | |
| parent | b29a905f949dbed5052c55184bd5e0838517ec8d (diff) | |
| parent | 35d0d82ae3edf8fe959624999c858a63b2b4ed52 (diff) | |
| download | rails-b359f9fe7cc3f664e145fae7b0d5b5c309587ef8.tar.gz rails-b359f9fe7cc3f664e145fae7b0d5b5c309587ef8.tar.bz2 rails-b359f9fe7cc3f664e145fae7b0d5b5c309587ef8.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/metal/instrumentation.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/instrumentation.rb | 2 |
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 dc3ea939e6..4e54c2ad88 100644 --- a/actionpack/lib/action_controller/metal/instrumentation.rb +++ b/actionpack/lib/action_controller/metal/instrumentation.rb @@ -14,7 +14,7 @@ module ActionController attr_internal :view_runtime - def process_action(action, *args) + def process_action(*args) raw_payload = { :controller => self.class.name, :action => self.action_name, |