updated to rails 2.3.8, yay

radiant · Jun 15, 2010 · be1754d · be1754d
1 parent 58ea732
commit be1754d
Show file tree

Hide file tree

Showing 634 changed files with 97,030 additions and 22,450 deletions.
diff --git a/vendor/rails/Rakefile b/vendor/rails/Rakefile
diff --git a/vendor/rails/actionmailer/CHANGELOG b/vendor/rails/actionmailer/CHANGELOG
@@ -1,15 +1,33 @@
+*2.3.8 (May 24, 2010)*
+
+* Version bump.
+
+
+*2.3.7 (May 24, 2010)*
+
+* Version bump.
+
+
+*2.3.6 (May 23, 2010)*
+
+* Upgrade TMail from 1.2.3 to 1.2.7.  [Mikel Lindsaar]
+
+
 *2.3.5 (November 25, 2009)*
 
 * Minor Bug Fixes and deprecation warnings
 
+
 *2.3.4 (September 4, 2009)*
 
 * Minor bug fixes.
 
+
 *2.3.3 (July 12, 2009)*
 
 * No changes, just a version bump.
 
+
 *2.3.2 [Final] (March 15, 2009)*
 
 * Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]

diff --git a/vendor/rails/actionmailer/MIT-LICENSE b/vendor/rails/actionmailer/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2009 David Heinemeier Hansson
+Copyright (c) 2004-2010 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/vendor/rails/actionmailer/Rakefile b/vendor/rails/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', '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.8' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

diff --git a/vendor/rails/actionmailer/lib/action_mailer.rb b/vendor/rails/actionmailer/lib/action_mailer.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2009 David Heinemeier Hansson
+# Copyright (c) 2004-2010 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

diff --git a/vendor/rails/actionmailer/lib/action_mailer/base.rb b/vendor/rails/actionmailer/lib/action_mailer/base.rb
@@ -593,7 +593,7 @@ def template_root=(root)
       end
 
       def template_path
-        "#{template_root}/#{mailer_name}"
+        File.join(template_root, mailer_name)
       end
 
       def initialize_template_class(assigns)
@@ -675,7 +675,7 @@ def create_mail
       def perform_delivery_smtp(mail)
         destinations = mail.destinations
         mail.ready_to_send
-        sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
+        sender = (mail['return-path'] && mail['return-path'].spec) || Array(mail.from).first
 
         smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port])
         smtp.enable_starttls_auto if smtp_settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto)

diff --git a/vendor/rails/actionmailer/lib/action_mailer/quoting.rb b/vendor/rails/actionmailer/lib/action_mailer/quoting.rb
@@ -1,3 +1,4 @@
+# encoding: us-ascii
 module ActionMailer
   module Quoting #:nodoc:
     # Convert the given text into quoted printable format, with an instruction

diff --git a/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb b/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb