diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-07-28 12:03:16 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-28 12:03:16 +0100 |
| commit | de211914d84737c4314e862b459b9a23a0baa28f (patch) | |
| tree | 3f04c940a4c821014332ddc4f119a81a37db3a33 /actionpack/CHANGELOG | |
| parent | 6246a8e06035973c88a38826ce1ee6b07b03b8dc (diff) | |
| parent | 10d9fe4bf3110c1d5de0c6b509fe0cbb9d5eda1d (diff) | |
| download | rails-de211914d84737c4314e862b459b9a23a0baa28f.tar.gz rails-de211914d84737c4314e862b459b9a23a0baa28f.tar.bz2 rails-de211914d84737c4314e862b459b9a23a0baa28f.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/cookies.rb
actionpack/lib/action_controller/streaming.rb
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_view/base.rb
actionpack/lib/action_view/helpers/date_helper.rb
actionpack/lib/action_view/helpers/debug_helper.rb
actionpack/lib/action_view/helpers/form_options_helper.rb
actionpack/lib/action_view/helpers/javascript_helper.rb
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/validations.rb
activeresource/README
activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb
activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb
railties/doc/guides/actionview/helpers.markdown
railties/doc/guides/actionview/partials.markdown
railties/doc/guides/activerecord/basics.markdown
Diffstat (limited to 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 5b7bfe9c30..03e011c75c 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,21 @@ *Edge* +* AbstractRequest.relative_url_root is no longer automatically configured by a HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root [Josh Peek] + +* Update Prototype to 1.6.0.2 #599 [Patrick Joyce] + +* Conditional GET utility methods. [Jeremy Kemper] + * etag!([:admin, post, current_user]) sets the ETag response header and returns head(:not_modified) if it matches the If-None-Match request header. + * last_modified!(post.updated_at) sets Last-Modified and returns head(:not_modified) if it's no later than If-Modified-Since. + +* All 2xx requests are considered successful [Josh Peek] + +* Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host along with the source or per-request proc's won't run [DHH] + +* Removed config.action_view.cache_template_loading, use config.cache_classes instead [Josh Peek] + +* Get buffer for fragment cache from template's @output_buffer [Josh Peek] + * Set config.action_view.warn_cache_misses = true to receive a warning if you perform an action that results in an expensive disk operation that could be cached [Josh Peek] * Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class [Josh Peek] |