diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-20 23:13:19 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-20 23:13:19 +0200 |
| commit | 207fa59675cb624dde0e01c1d57597f752cdf095 (patch) | |
| tree | 472d03af5bc3e2df1b759717f723ca914f2a77aa /actionpack/lib/action_controller/metal | |
| parent | 31cadc730a40281950a265ff6982dd76cc326828 (diff) | |
| parent | 50d37a76064239a731f81a4ba68b80946c4dfae2 (diff) | |
| download | rails-207fa59675cb624dde0e01c1d57597f752cdf095.tar.gz rails-207fa59675cb624dde0e01c1d57597f752cdf095.tar.bz2 rails-207fa59675cb624dde0e01c1d57597f752cdf095.zip | |
Merge remote branch 'rails/master'
Conflicts:
actionpack/lib/abstract_controller/base.rb
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rack_delegation.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb index 508ea6e2b7..544b4989c7 100644 --- a/actionpack/lib/action_controller/metal/rack_delegation.rb +++ b/actionpack/lib/action_controller/metal/rack_delegation.rb @@ -14,10 +14,6 @@ module ActionController super(action, request) end - def params - @_params ||= @_request.parameters - end - def response_body=(body) response.body = body if response super |