aboutsummaryrefslogtreecommitdiffstats
path: root/railties
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 /railties
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 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/Rakefile10
-rw-r--r--railties/lib/rails/version.rb4
3 files changed, 8 insertions, 8 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 2af9946c69..52ddc5c464 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.0/3.0*
+*2.3.0 [Edge]*
* Added config.i18n settings gatherer to config/environment, auto-loading of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [DHH]
diff --git a/railties/Rakefile b/railties/Rakefile
index 888bebc6dc..8c8bec0d27 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -361,11 +361,11 @@ spec = Gem::Specification.new do |s|
EOF
s.add_dependency('rake', '>= 0.8.3')
- s.add_dependency('activesupport', '= 2.2.1' + PKG_BUILD)
- s.add_dependency('activerecord', '= 2.2.1' + PKG_BUILD)
- s.add_dependency('actionpack', '= 2.2.1' + PKG_BUILD)
- s.add_dependency('actionmailer', '= 2.2.1' + PKG_BUILD)
- s.add_dependency('activeresource', '= 2.2.1' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD)
+ s.add_dependency('activerecord', '= 2.3.0' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 2.3.0' + PKG_BUILD)
+ s.add_dependency('actionmailer', '= 2.3.0' + PKG_BUILD)
+ s.add_dependency('activeresource', '= 2.3.0' + PKG_BUILD)
s.rdoc_options << '--exclude' << '.'
s.has_rdoc = false
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index bd835fba26..9bb4b2a96d 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,8 +1,8 @@
module Rails
module VERSION #:nodoc:
MAJOR = 2
- MINOR = 2
- TINY = 1
+ MINOR = 3
+ TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')
end