From 57c31a380e0136607f3ce6ee568730ec1539e163 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 23 Oct 2008 20:14:20 +0200 Subject: Prepare for Rails 2.2.0 [RC1] --- actionmailer/CHANGELOG | 3 +++ actionmailer/Rakefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index fc02ae8ffc..a29b3828ec 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 612bd27774..00d26a285b 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' -- cgit v1.2.3 From eec6e0cbbddcc9bf141387536d4b910cc0df9d4d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 23 Oct 2008 20:18:11 +0200 Subject: Push to new gem server --- actionmailer/Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index 00d26a285b..fd0ef2dc51 100644 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -76,8 +76,8 @@ end desc "Publish the API documentation" task :pgem => [:package] do - Rake::SshFilePublisher.new("wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload - `ssh wrath.rubyonrails.org './gemupdate.sh'` + Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload + `ssh gems.rubyonrails.org './gemupdate.sh'` end desc "Publish the API documentation" -- cgit v1.2.3 From 5366e61458cb642429a80297abefddcda6696abe Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 23 Oct 2008 20:29:25 +0200 Subject: Proper update call for gem server --- actionmailer/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index fd0ef2dc51..9f4a387126 100644 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -77,7 +77,7 @@ end desc "Publish the API documentation" task :pgem => [:package] do Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload - `ssh gems.rubyonrails.org './gemupdate.sh'` + `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'` end desc "Publish the API documentation" -- cgit v1.2.3 From d224e6ccb131559190f35c8ddfc9b31274ac5a89 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 24 Oct 2008 13:08:47 +0200 Subject: Update CHANGELOGs with the last few fixes, set date for today --- actionmailer/CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index a29b3828ec..d8636fd83d 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,4 +1,4 @@ -*2.2.0 [RC1] (October 23rd, 2008)* +*2.2.0 [RC1] (October 24th, 2008)* * Add layout functionality to mailers [Pratik] -- cgit v1.2.3