diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-23 20:14:20 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-23 20:14:20 +0200 |
| commit | 57c31a380e0136607f3ce6ee568730ec1539e163 (patch) | |
| tree | a4d864f25e37bc99e7ddba0da3be29ca407ecf54 /actionmailer | |
| parent | 1a0e7390fc29cd2dee03bcf9e4c80e546a2134b8 (diff) | |
| download | rails-57c31a380e0136607f3ce6ee568730ec1539e163.tar.gz rails-57c31a380e0136607f3ce6ee568730ec1539e163.tar.bz2 rails-57c31a380e0136607f3ce6ee568730ec1539e163.zip | |
Prepare for Rails 2.2.0 [RC1]
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 3 | ||||
| -rw-r--r-- | actionmailer/Rakefile | 2 |
2 files changed, 4 insertions, 1 deletions
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' |