diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record.rb | 1 | ||||
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb (renamed from activerecord/lib/active_record/values/time_zone.rb) | 0 |
6 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 8a09af333a..0587481f60 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -4,7 +4,7 @@ * Fixed that send_file/data can work even if render* has been called before in action processing to render the content of a file to be send for example #601 -* Added FormOptionsHelper#time_zone_select and FormOptionsHelper#time_zone_options_for_select to work with the new value object TimeZone in Active Record #688 [Jamis Buck] +* Added FormOptionsHelper#time_zone_select and FormOptionsHelper#time_zone_options_for_select to work with the new value object TimeZone in Active Support #688 [Jamis Buck] * Added FormHelper#file_field and FormTagHelper#file_field_tag for creating file upload fields diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 2bc6f1475c..4177823180 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -20,8 +20,6 @@ The OCI8 driver can be retrieved from http://rubyforge.org/projects/ruby-oci8/ -* Added TimeZone as the first of a number of value objects that Active Record will start shipping to provide incentatives to use rich value objects using composed_of #688 [Jamis Buck] - * Added option :schema_order to the PostgreSQL adapter to support the use of multiple schemas per database #697 [YuriSchimke] * Optimized the SQL used to generate has_and_belongs_to_many queries by listing the join table first #693 [yerejm] diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 71f574680b..11d327e6a9 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -47,7 +47,6 @@ require 'active_record/timestamp' require 'active_record/acts/list' require 'active_record/acts/tree' require 'active_record/locking' -require 'active_record/values/time_zone' ActiveRecord::Base.class_eval do include ActiveRecord::Validations diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 12ed008151..d560a7c1de 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,3 +1,5 @@ +* Added TimeZone as the first of a number of value objects that among others Active Record can use rich value objects using composed_of #688 [Jamis Buck] + * Added Date::Conversions for getting dates in different convenient string representations and other objects * Added Time::Conversions for getting times in different convenient string representations and other objects diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 30034a316e..11d5c4e1ec 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -27,3 +27,5 @@ require 'active_support/core_ext' require 'active_support/clean_logger' require 'active_support/misc' require 'active_support/dependencies' + +require 'active_support/values/time_zone'
\ No newline at end of file diff --git a/activerecord/lib/active_record/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 7766727a40..7766727a40 100644 --- a/activerecord/lib/active_record/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb |