aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-25 22:11:48 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-25 22:11:48 +0000
commitc7a6b9862dca37fd393a7585f850dfb46725ad40 (patch)
treea135a8b2e00f10d9b71e669b9d46fbc710d86e41 /activerecord
parent06303ed34eea1f9c3dfa8c7d0ada186b0faf648f (diff)
downloadrails-c7a6b9862dca37fd393a7585f850dfb46725ad40.tar.gz
rails-c7a6b9862dca37fd393a7585f850dfb46725ad40.tar.bz2
rails-c7a6b9862dca37fd393a7585f850dfb46725ad40.zip
Prepared for release of 0.14.2 (RC3)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2737 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG3
-rwxr-xr-xactiverecord/Rakefile2
-rw-r--r--activerecord/lib/active_record/version.rb2
3 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 585f9d602e..def38e20cc 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*1.12.2* (October 26th, 2005)
* Allow symbols to rename columns when using SQLite adapter. #2531 [kevin.clark@gmail.com]
@@ -12,6 +12,7 @@
* Make all tests runnable on their own. #2521. [Blair Zajac <blair@orcaware.com>]
+
*1.12.1* (October 19th, 2005)
* Always parenthesize :conditions options so they may be safely combined with STI and constraints.
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index c7dc13e51b..f96665c933 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -71,7 +71,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.2.1' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 1.2.2' + 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 5fc3de2cd2..1f930d6466 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -2,7 +2,7 @@ module ActiveRecord
module Version #:nodoc:
MAJOR = 1
MINOR = 12
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end