diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-09-03 17:44:58 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-09-03 17:44:58 +0100 |
| commit | 2933f4481f8b70b3b809fab6e818d80c2af1b919 (patch) | |
| tree | c83d1308545cc82215b90ab37208cc81b4712276 /actionpack/lib/action_controller/response.rb | |
| parent | 36ee17d458b86c5f3f371810160e8839d318bbf1 (diff) | |
| parent | 10fe6a6d8940300dd6698ec38e9c9573404e687d (diff) | |
| download | rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.tar.gz rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.tar.bz2 rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'actionpack/lib/action_controller/response.rb')
| -rw-r--r-- | actionpack/lib/action_controller/response.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/response.rb b/actionpack/lib/action_controller/response.rb index 5dac4128bb..54a99996ef 100644 --- a/actionpack/lib/action_controller/response.rb +++ b/actionpack/lib/action_controller/response.rb @@ -129,8 +129,8 @@ module ActionController # :nodoc: def prepare! assign_default_content_type_and_charset! - set_content_length! handle_conditional_get! + set_content_length! convert_content_type! end |