diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-05-31 17:03:03 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-05-31 17:03:03 -0700 |
| commit | f9db7695fe3c148c8d1077f1564e5b94d126b83b (patch) | |
| tree | 3f9d63095f88c0537a0f2e9865833f4010131dda /railties | |
| parent | ef0ea782b1f5cf7b08e74ea3002a16c708f66645 (diff) | |
| download | rails-f9db7695fe3c148c8d1077f1564e5b94d126b83b.tar.gz rails-f9db7695fe3c148c8d1077f1564e5b94d126b83b.tar.bz2 rails-f9db7695fe3c148c8d1077f1564e5b94d126b83b.zip | |
Making ready for release of 2.1
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 8 | ||||
| -rw-r--r-- | railties/Rakefile | 10 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 4 |
3 files changed, 8 insertions, 14 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 7f1c6ad747..fe517755ef 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,10 +1,4 @@ -*SVN* - -* Consolidate error messages for missing gems, and skip them when running rake gems:* tasks. [rick] - -* Use a system command to install gems, since GemRunner exits the ruby process. #210 [Tim Morgan] - -*2.1.0 RC1 (May 11th, 2008)* +*2.1.0 (May 31st, 2008)* * script/dbconsole fires up the command-line database client. #102 [Steve Purcell] diff --git a/railties/Rakefile b/railties/Rakefile index 45ba394299..a1d1095c37 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -304,11 +304,11 @@ spec = Gem::Specification.new do |s| EOF s.add_dependency('rake', '>= 0.8.1') - s.add_dependency('activesupport', '= 2.0.991' + PKG_BUILD) - s.add_dependency('activerecord', '= 2.0.991' + PKG_BUILD) - s.add_dependency('actionpack', '= 2.0.991' + PKG_BUILD) - s.add_dependency('actionmailer', '= 2.0.991' + PKG_BUILD) - s.add_dependency('activeresource', '= 2.0.991' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.1.0' + PKG_BUILD) + s.add_dependency('activerecord', '= 2.1.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.1.0' + PKG_BUILD) + s.add_dependency('actionmailer', '= 2.1.0' + PKG_BUILD) + s.add_dependency('activeresource', '= 2.1.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 fea63beea9..48d24da52e 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 = 0 - TINY = 991 + MINOR = 1 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end |