aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-11-14 12:26:50 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-14 12:26:50 +0100
commit61e43700b85de753b6254893d5365e04d3465b9a (patch)
treec1231e8cecf730407ba2afd1edced737081c54b7 /actionpack
parent94d6716324126028b89dde886f160474049b1b0c (diff)
downloadrails-61e43700b85de753b6254893d5365e04d3465b9a.tar.gz
rails-61e43700b85de753b6254893d5365e04d3465b9a.tar.bz2
rails-61e43700b85de753b6254893d5365e04d3465b9a.zip
Prepare for RC2
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG4
-rw-r--r--actionpack/lib/action_pack/version.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 97389dfc20..dc7ee64358 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,4 +1,6 @@
-*2.2.1 [RC2 or 2.2 final]*
+*2.2.1 [RC2] (November 14th, 2008)*
+
+* Added render :js for people who want to render inline JavaScript replies without using RJS [DHH]
* Fixed that polymorphic_url should compact given array #1317 [hiroshi]
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 288b62778e..126d16e5f4 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
module VERSION #:nodoc:
MAJOR = 2
MINOR = 2
- TINY = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
end