aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-11-19 14:12:38 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-19 14:12:38 +0100
commit51a19ae2bf33e66b23ff5c91bf584b2efa9e669f (patch)
tree9616aecf1e1337e3ea2aee3f67f307f49183724e /actionpack
parente442448fa3f706062ef9c89912c1fd95e1119f67 (diff)
downloadrails-51a19ae2bf33e66b23ff5c91bf584b2efa9e669f.tar.gz
rails-51a19ae2bf33e66b23ff5c91bf584b2efa9e669f.tar.bz2
rails-51a19ae2bf33e66b23ff5c91bf584b2efa9e669f.zip
Assume that the next version is going to be 2.3 for now
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/Rakefile2
-rw-r--r--actionpack/lib/action_pack/version.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 9f84910156..6df755dd9e 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.0/3.0*
+*2.3.0 [Edge]*
* Changed the default of ActionView#render to assume partials instead of files when not given an options hash [DHH]. Examples:
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 4020b4aa78..74c04c7740 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -80,7 +80,7 @@ spec = Gem::Specification.new do |s|
s.has_rdoc = true
s.requirements << 'none'
- s.add_dependency('activesupport', '= 2.2.1' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD)
s.require_path = 'lib'
s.autorequire = 'action_controller'
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 126d16e5f4..f20e44a7d5 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -1,8 +1,8 @@
module ActionPack #:nodoc:
module VERSION #:nodoc:
MAJOR = 2
- MINOR = 2
- TINY = 1
+ MINOR = 3
+ TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')
end