aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-12-06 18:12:48 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-12-06 18:12:48 +0000
commit729741a3fa91fb92a60795a3c9c3e3928723023c (patch)
tree82dcd9f67797eade66c20417cb85c7f09af61d7d /activerecord
parente16ecaf84c05b054a8ec3b776b3223880edda3d4 (diff)
downloadrails-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 'activerecord')
-rw-r--r--activerecord/CHANGELOG5
-rwxr-xr-xactiverecord/Rakefile2
-rw-r--r--activerecord/lib/active_record/version.rb6
3 files changed, 5 insertions, 8 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index c3b5a60a03..698ad6263a 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*2.0.0* (December 6th, 2007)
* Fixed that the truncation of strings longer than 50 chars should use inspect so newlines etc are escaped #10385 [norbert]
@@ -20,9 +20,6 @@
* Fix documentation typo introduced in [8250]. Closes #10339 [Henrik N]
-
-*2.0.0 [RC2]* (November 28th, 2007)
-
* Foxy fixtures: support single-table inheritance. #10234 [tom]
* Foxy fixtures: allow mixed usage to make migration easier and more attractive. #10004 [lotswholetime]
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 766cfaa95f..7b51c57240 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -172,7 +172,7 @@ spec = Gem::Specification.new do |s|
s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
end
- s.add_dependency('activesupport', '= 1.99.1' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 2.0.0' + PKG_BUILD)
s.files.delete "test/fixtures/fixture_database.sqlite"
s.files.delete "test/fixtures/fixture_database_2.sqlite"
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index c111082ffc..da83c707ce 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -1,8 +1,8 @@
module ActiveRecord
module VERSION #:nodoc:
- MAJOR = 1
- MINOR = 99
- TINY = 1
+ MAJOR = 2
+ MINOR = 0
+ TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')
end