diff options
| author | gbuesing <gbuesing@gmail.com> | 2008-04-20 21:57:56 -0500 |
|---|---|---|
| committer | gbuesing <gbuesing@gmail.com> | 2008-04-20 21:57:56 -0500 |
| commit | 6ef4239f8bd4d4ea7a5bc7f2cdaf14f87e6eb9a1 (patch) | |
| tree | 54a76b1698a9012d5b37c3ee13d258c9a03beaa6 /actionpack/CHANGELOG | |
| parent | 32b82e4c6f5523cdf5ee78c3022c50b46e018351 (diff) | |
| parent | 1d18651ea36e2ba274b6c2e0fd4edd425e028589 (diff) | |
| download | rails-6ef4239f8bd4d4ea7a5bc7f2cdaf14f87e6eb9a1.tar.gz rails-6ef4239f8bd4d4ea7a5bc7f2cdaf14f87e6eb9a1.tar.bz2 rails-6ef4239f8bd4d4ea7a5bc7f2cdaf14f87e6eb9a1.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 9c72fd945a..6555560bdd 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Remove ActionController::Base#view_controller_internals flag. [Pratik] + * Add conditional options to caches_page method. [Paul Horsfall] * Move missing template logic to ActionView. [Pratik] |