diff options
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 4 | ||||
| -rwxr-xr-x | actionmailer/Rakefile | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index c30eaa425e..c55061b1ce 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,4 +1,4 @@ -*SVN* +*1.2.0* (March 27th, 2005) * Nil charset caused subject line to be improperly quoted in implicitly multipart messages #2662 [ehalvorsen+rails@runbox.com] @@ -12,10 +12,12 @@ * Make sure TMail#attachments includes anything with content-disposition of "attachment", regardless of content-type [Jamis Buck] + *1.1.5* (December 13th, 2005) * Become part of Rails 1.0 + *1.1.4* (December 7th, 2005) * Rename Version constant to VERSION. #2802 [Marcel Molina Jr.] diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index 498298298b..3da850b966 100755 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 1.11.2' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.12.0' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 02c6d83eb0..44e37853f1 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,8 +1,8 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 1 - MINOR = 1 - TINY = 5 + MINOR = 2 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end |