aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2010-07-26 12:52:34 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-07-26 12:53:25 -0500
commit856fc4bbc379b330d11702adbc2b26850dca6206 (patch)
tree904e79aecacae1aed69d63ff6cf4da960bb94ddf /activeresource
parentdd61a817dea85990f13664d74bca15bc5796b76e (diff)
downloadrails-856fc4bbc379b330d11702adbc2b26850dca6206.tar.gz
rails-856fc4bbc379b330d11702adbc2b26850dca6206.tar.bz2
rails-856fc4bbc379b330d11702adbc2b26850dca6206.zip
Prep for RC
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/CHANGELOG5
-rw-r--r--activeresource/lib/active_resource/version.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index 2b2092b9fe..8fa1b0b4b3 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,3 +1,8 @@
+*Rails 3.0.0 [release candidate] (July 26th, 2010)*
+
+* No material changes
+
+
*Rails 3.0.0 [beta 4] (June 8th, 2010)*
* JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option. [Santiago Pastorino]
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 198e77a3d1..43c00e9cf1 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -3,7 +3,7 @@ module ActiveResource
MAJOR = 3
MINOR = 0
TINY = 0
- BUILD = "beta4"
+ BUILD = "rc"
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
end