From 57c31a380e0136607f3ce6ee568730ec1539e163 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 23 Oct 2008 20:14:20 +0200 Subject: [PATCH] Prepare for Rails 2.2.0 [RC1] --- actionmailer/CHANGELOG | 3 +++ actionmailer/Rakefile | 2 +- actionpack/CHANGELOG | 2 +- actionpack/Rakefile | 2 +- activerecord/CHANGELOG | 2 +- activerecord/Rakefile | 2 +- activeresource/CHANGELOG | 2 +- activeresource/Rakefile | 2 +- activesupport/CHANGELOG | 2 +- railties/CHANGELOG | 2 +- railties/Rakefile | 12 ++++++------ 11 files changed, 18 insertions(+), 15 deletions(-) diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index fc02ae8ffc528..a29b3828ec612 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,8 +1,11 @@ +*2.2.0 [RC1] (October 23rd, 2008)* + * Add layout functionality to mailers [Pratik] Mailer layouts behaves just like controller layouts, except layout names need to have '_mailer' postfix for them to be automatically picked up. + *2.1.0 (May 31st, 2008)* * Fixed that a return-path header would be ignored #7572 [joost] diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index 612bd277741a9..00d26a285b2a2 100644 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -55,7 +55,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 2.1.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.2.0' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index fdc9be2ff46ed..3f2251fe9dc92 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,4 +1,4 @@ -*Edge* +*2.2.0 [RC1] (October 23rd, 2008)* * Added stale? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [DHH]. Example: diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 0ee9382e89cf7..2fa4f835a021a 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -80,7 +80,7 @@ spec = Gem::Specification.new do |s| s.has_rdoc = true s.requirements << 'none' - s.add_dependency('activesupport', '= 2.1.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.2.0' + PKG_BUILD) s.require_path = 'lib' s.autorequire = 'action_controller' diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 6479cc5a9b9eb..7e00b845993ea 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,4 +1,4 @@ -*Edge* +*2.2.0 [RC1] (October 23rd, 2008)* * Add Model#delete instance method, similar to Model.delete class method. #1086 [Hongli Lai] diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 983528aff7a87..9574a431ba520 100644 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -171,7 +171,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', '= 2.1.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.2.0' + PKG_BUILD) s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite" s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite" diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index e93b3ec15ba8e..bb9a39a865beb 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,4 +1,4 @@ -*Edge* +*2.2.0 [RC1] (October 23rd, 2008)* * Add ActiveResource::Base#to_xml and ActiveResource::Base#to_json. #1011 [Rasik Pandey, Cody Fauser] diff --git a/activeresource/Rakefile b/activeresource/Rakefile index 8c3ad36a02555..51559fa6f872e 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -65,7 +65,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', '= 2.1.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.2.0' + PKG_BUILD) s.require_path = 'lib' s.autorequire = 'active_resource' diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 803f95d90eeb8..2bce5f2264481 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,4 +1,4 @@ -*Edge* +*2.2.0 [RC1] (October 23rd, 2008)* * TimeWithZone#freeze: preload instance variables so that we can actually freeze [Geoff Buesing] diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 51d66e4c016a8..3d848b267cac6 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,4 +1,4 @@ -*Edge* +*2.2.0 [RC1] (October 23rd, 2008)* * Fixed that sqlite would report "db/development.sqlite3 already exists" whether true or not on db:create #614 [Antonio Cangiano] diff --git a/railties/Rakefile b/railties/Rakefile index 5100b4bd9b608..981b3ab58b3ee 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -348,12 +348,12 @@ spec = Gem::Specification.new do |s| on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates. EOF - s.add_dependency('rake', '>= 0.8.1') - s.add_dependency('activesupport', '= 2.1.0' + PKG_BUILD) - s.add_dependency('activerecord', '= 2.1.0' + PKG_BUILD) - s.add_dependency('actionpack', '= 2.1.0' + PKG_BUILD) - s.add_dependency('actionmailer', '= 2.1.0' + PKG_BUILD) - s.add_dependency('activeresource', '= 2.1.0' + PKG_BUILD) + s.add_dependency('rake', '>= 0.8.3') + s.add_dependency('activesupport', '= 2.2.0' + PKG_BUILD) + s.add_dependency('activerecord', '= 2.2.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.2.0' + PKG_BUILD) + s.add_dependency('actionmailer', '= 2.2.0' + PKG_BUILD) + s.add_dependency('activeresource', '= 2.2.0' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false