diff options
| author | José Valim <jose.valim@gmail.com> | 2010-08-30 15:55:07 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-08-30 15:55:10 -0300 |
| commit | d37a65307d280e47eb5c15b61c0b20ac6cab6a84 (patch) | |
| tree | 39f6e9036ab11b5059f34e72e65dfeca84bcbbff /activerecord | |
| parent | 3c8e1f99b9613cca4813e2a1b062d58ec4b2627b (diff) | |
| parent | b422cda2ebfff4032f4c18271e96ad329c413dcc (diff) | |
| download | rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.tar.gz rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.tar.bz2 rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.zip | |
Merge josevalim/deprecations branch.
I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 18 | ||||
| -rw-r--r-- | activerecord/activerecord.gemspec | 2 |
2 files changed, 3 insertions, 17 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 262db3c5ca..62f1470287 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,14 +1,9 @@ -*Rails 3.0.0 (unreleased)* +*Rails 3.1.0 (unreleased)* * No changes -*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)* - -* No changes - - -*Rails 3.0.0 [release candidate] (July 26th, 2010)* +*Rails 3.0.0 (August 29, 2010)* * Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh] @@ -20,9 +15,6 @@ * PostgreSQL: ensure the database time zone matches Ruby's time zone #4895 [Aaron Patterson] - -*Rails 3.0.0 [beta 4] (June 8th, 2010)* - * Fixed that ActiveRecord::Base.compute_type would swallow NoMethodError #4751 [Andrew Bloomgarden, Andrew White] * Add index length support for MySQL. #1852 [Emili Parreno, Pratik Naik] @@ -47,9 +39,6 @@ * Observers can prevent records from saving by returning false, just like before_save and friends. #4087 [Mislav Marohnić] - -*Rails 3.0.0 [beta 3] (April 13th, 2010)* - * Add Relation extensions. [Pratik Naik] users = User.where(:admin => true).extending(User::AdminPowers) @@ -64,9 +53,6 @@ * Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the MySQL driver to improve log signal to noise ration in development [DHH] - -*Rails 3.0.0 [Beta 1] (February 4th, 2010)* - * PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns. #3777 [Jack Christensen] * Allow relations to be used as scope. diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec index 0ed88a06e2..1387d6e288 100644 --- a/activerecord/activerecord.gemspec +++ b/activerecord/activerecord.gemspec @@ -23,6 +23,6 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('activemodel', version) - s.add_dependency('arel', '~> 1.0.0') + s.add_dependency('arel', '~> 1.0.1') s.add_dependency('tzinfo', '~> 0.3.23') end |