diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-11-02 03:52:15 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-11-02 03:52:15 +0530 |
| commit | 1147453fce0890ea229c3af5f43c909ebe53061e (patch) | |
| tree | 221d816ef0c908044fd6029950ccad064866ab8f /actionpack/CHANGELOG | |
| parent | a3aa0c17ef8594a0084511f4852be7b5dc66e5e2 (diff) | |
| parent | 5a02f0bccf55191c2cfbcc69bd8165df6d7a2012 (diff) | |
| download | rails-1147453fce0890ea229c3af5f43c909ebe53061e.tar.gz rails-1147453fce0890ea229c3af5f43c909ebe53061e.tar.bz2 rails-1147453fce0890ea229c3af5f43c909ebe53061e.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/layouts_and_rendering.html
railties/doc/guides/source/active_record_basics.txt
railties/doc/guides/source/layouts_and_rendering.txt
Diffstat (limited to 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 3c06c87bb2..17fada156d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,3 +1,14 @@ +*2.2.1 [RC2 or 2.2 final]* + +* Simplified the logging format for parameters (don't include controller, action, and format as duplicates) [DHH] + +* Remove the logging of the Session ID when the session store is CookieStore [DHH] + +* Fixed regex in redirect_to to fully support URI schemes #1247 [Seth Fitzsimmons] + +* Fixed bug with asset timestamping when using relative_url_root #1265 [Joe Goldwasser] + + *2.2.0 [RC1] (October 24th, 2008)* * Fix incorrect closing CDATA delimiter and that HTML::Node.parse would blow up on unclosed CDATA sections [packagethief] |