diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 12:21:04 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 12:21:04 -0800 |
| commit | eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3 (patch) | |
| tree | 3b193dba9756b45e1a0a70d47faa4c3e2ff946a9 /activesupport/CHANGELOG | |
| parent | 1304b664924bfea54fd6dc0dc924ae3d126ff92d (diff) | |
| parent | 4f984c9d0e66601a81cb5ae6e3b50582e6dc0c2d (diff) | |
| download | rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.tar.gz rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.tar.bz2 rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'activesupport/CHANGELOG')
| -rw-r--r-- | activesupport/CHANGELOG | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index e77affc315..ded72be2f2 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,6 +1,11 @@ -*2.2.1 [RC2 or 2.2 final]* +*2.3.0/3.0* -* Added render :js for people who want to render inline JavaScript replies without using RJS [DHH] +* Added lambda merging to OptionMerger (especially useful with named_scope and with_options) #726 [Paweł Kondzior] + + +*2.2.1 [RC2] (November 14th, 2008)* + +* Increment the version of our altered memcache-client to prevent confusion caused when the 1.5.0 gem is installed. * Fixed the option merging in Array#to_xml #1126 [Rudolf Gavlas] |