diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-06 18:12:48 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-06 18:12:48 +0000 |
| commit | 729741a3fa91fb92a60795a3c9c3e3928723023c (patch) | |
| tree | 82dcd9f67797eade66c20417cb85c7f09af61d7d /railties | |
| parent | e16ecaf84c05b054a8ec3b776b3223880edda3d4 (diff) | |
| download | rails-729741a3fa91fb92a60795a3c9c3e3928723023c.tar.gz rails-729741a3fa91fb92a60795a3c9c3e3928723023c.tar.bz2 rails-729741a3fa91fb92a60795a3c9c3e3928723023c.zip | |
Preparing for release shortly
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8321 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 5 | ||||
| -rw-r--r-- | railties/Rakefile | 10 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 6 |
3 files changed, 9 insertions, 12 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 99502c9c40..3ddaa3b4fb 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,4 +1,4 @@ -*SVN* +*2.0.0* (December 6th, 2007) * Add warning to documentation about using transactional fixtures when the code under test uses transactions itself. Closes #7548 [thijsv] @@ -10,9 +10,6 @@ * Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 [jbarnette] - -*2.0.0 [RC2]* (November 28th, 2007) - * Update to Prototype -r8232. [sam] * Introduce SecretKeyGenerator for more secure session secrets than CGI::Session's pseudo-random id generator. Consider extracting to Active Support later. #10286 [Hongli Lai] diff --git a/railties/Rakefile b/railties/Rakefile index ea2a2c8d66..5e89a1b42c 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -312,11 +312,11 @@ spec = Gem::Specification.new do |s| EOF s.add_dependency('rake', '>= 0.7.2') - s.add_dependency('activesupport', '= 1.99.1' + PKG_BUILD) - s.add_dependency('activerecord', '= 1.99.1' + PKG_BUILD) - s.add_dependency('actionpack', '= 1.99.1' + PKG_BUILD) - s.add_dependency('actionmailer', '= 1.99.1' + PKG_BUILD) - s.add_dependency('activeresource', '= 1.99.1' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.0.0' + PKG_BUILD) + s.add_dependency('activerecord', '= 2.0.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.0.0' + PKG_BUILD) + s.add_dependency('actionmailer', '= 2.0.0' + PKG_BUILD) + s.add_dependency('activeresource', '= 2.0.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 5d4d6a0328..db1f8a1c63 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -1,8 +1,8 @@ module Rails module VERSION #:nodoc: - MAJOR = 1 - MINOR = 99 - TINY = 1 + MAJOR = 2 + MINOR = 0 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end |