aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG3
-rw-r--r--activerecord/lib/active_record/version.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 05743e9f4f..ec73763324 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*1.12.1*
+*1.12.1* (October 19th, 2005)
* Always parenthesize :conditions options so they may be safely combined with STI and constraints.
@@ -6,6 +6,7 @@
* Added support for using limits in eager loads that involve has_many and has_and_belongs_to_many associations
+
*1.12.0* (October 16th, 2005)
* Update/clean up documentation (rdoc)
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index beecbf445f..5fc3de2cd2 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 = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
end