aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2013-02-25 08:31:50 -0600
committerDavid Heinemeier Hansson <david@loudthinking.com>2013-02-25 08:31:50 -0600
commitc0bc9ce38c6528916f9dd440984a386511e4297d (patch)
tree61724f7e11eaebf923d46ac87a4f9d24c44cc247 /actionpack
parentebe9590def08b5bf23372b0e5d88bd210864f2de (diff)
downloadrails-c0bc9ce38c6528916f9dd440984a386511e4297d.tar.gz
rails-c0bc9ce38c6528916f9dd440984a386511e4297d.tar.bz2
rails-c0bc9ce38c6528916f9dd440984a386511e4297d.zip
Preparing for 4.0.0.beta1 release
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md2
-rw-r--r--actionpack/lib/action_pack/version.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 5be7f34331..5197d944b1 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.0.0 (unreleased) ##
+## Rails 4.0.0.beta1 (February 25, 2013) ##
* Fix `respond_to` not using formats that have no block if all is present. *Michael Grosser*
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 94cbc8e478..5c87a9cd7c 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,7 +3,7 @@ module ActionPack
MAJOR = 4
MINOR = 0
TINY = 0
- PRE = "beta"
+ PRE = "beta1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end