aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG2
-rwxr-xr-xactionmailer/Rakefile2
-rw-r--r--actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb2
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 92dc24726b..220c16ca3b 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*2.0.0 [RC2]* (November 28th, 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 2f0fa63baa..ab46b1bfae 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', '= 1.99.0' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 1.99.1' + PKG_BUILD)
s.has_rdoc = true
s.requirements << 'none'
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb
index 175ea92538..14df4b06eb 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb
@@ -31,7 +31,7 @@ module TMail #:nodoc:
module VERSION #:nodoc:
MAJOR = 1
MINOR = 1
- TINY = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
end
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 12bb913d4c..32897bc890 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 = 1
MINOR = 99
- TINY = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
end