aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-12-16 23:30:30 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-12-16 23:30:30 +0000
commit69edebf0f1f66581e9dc9fd92e7ad9b617ad8f31 (patch)
treecca1a234c098eba6a30e127f9946cfa877db5862 /actionmailer
parent1427a49dc987952c0b30bb9025ab5284d73c8fe6 (diff)
downloadrails-69edebf0f1f66581e9dc9fd92e7ad9b617ad8f31.tar.gz
rails-69edebf0f1f66581e9dc9fd92e7ad9b617ad8f31.tar.bz2
rails-69edebf0f1f66581e9dc9fd92e7ad9b617ad8f31.zip
Prepare for 2.0.2 release
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG5
-rwxr-xr-xactionmailer/Rakefile2
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 2d1019e213..8ba3ccdea6 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,3 +1,8 @@
+*2.0.2* (December 16th, 2007)
+
+* Included in Rails 2.0.2
+
+
*2.0.1* (December 7th, 2007)
* Update ActionMailer so it treats ActionView the same way that ActionController does. Closes #10244 [rick]
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index b87361b4f6..4622871a6c 100755
--- 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.0.1' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 2.0.2' + 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 82136b6e93..954a472757 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 2
MINOR = 0
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end