Merge branch 'master' into inflector-with-lru-cache

Author: fxn

RAILS_VERSION

@@ -1 +1 @@
-4.0.0.beta1
+4.1.0.beta

README.md

@@ -70,7 +70,7 @@ We encourage you to contribute to Ruby on Rails! Please check out the
 
 ## Code Status
 
-* [![Build Status](https://secure.travis-ci.org/rails/rails.png)](http://travis-ci.org/rails/rails)
+* [![Build Status](https://api.travis-ci.org/rails/rails.png)](https://travis-ci.org/rails/rails)
 * [![Dependencies](https://gemnasium.com/rails/rails.png?travis)](https://gemnasium.com/rails/rails)
 
 ## License

actionmailer/CHANGELOG.md

@@ -1,62 +1,3 @@
-## Rails 4.0.0 (unreleased) ##
+* No changes.
 
-
-## Rails 4.0.0.beta1 (February 25, 2013) ##
-
-*   Allow passing interpolations to `#default_i18n_subject`, e.g.:
-
-        # config/locales/en.yml
-        en:
-          user_mailer:
-            welcome:
-              subject: 'Hello, %{username}'
-
-        # app/mailers/user_mailer.rb
-        class UserMailer < ActionMailer::Base
-          def welcome(user)
-            mail(subject: default_i18n_subject(username: user.name))
-          end
-        end
-
-    *Olek Janiszewski*
-
-*   Eager loading made to use relation's `in_clause_length` instead of host's one.
-    Fixes #8474.
-
-    *Boris Staal*
-
-*   Explicit multipart messages no longer set the order of the MIME parts.
-
-    *Nate Berkopec*
-
-*   Do not render views when `mail` isn't called. Fixes #7761.
-
-    *Yves Senn*
-
-*   Allow delivery method options to be set per mail instance.
-
-    If your SMTP delivery settings are dynamic, you can now override settings
-    per mail instance for e.g.
-
-        def my_mailer(user, company)
-          mail to: user.email, subject: "Welcome!",
-               delivery_method_options: { user_name: company.smtp_user,
-                                          password: company.smtp_password }
-        end
-
-    This will ensure that your default SMTP settings will be overridden
-    by the company specific ones. You only have to override the settings
-    that are dynamic and leave the static setting in your environment
-    configuration file (e.g. `config/environments/production.rb`).
-
-    *Aditya Sanghi*
-
-*   Allow to set default Action Mailer options via `config.action_mailer.default_options=`. *Robert Pankowecki*
-
-*   Raise an `ActionView::MissingTemplate` exception when no implicit template could be found. *Damien Mathieu*
-
-*   Allow callbacks to be defined in mailers similar to `ActionController::Base`. You can configure default
-    settings, headers, attachments, delivery settings or change delivery using
-    `before_filter`, `after_filter`, etc. *Justin S. Leitgeb*
-
-Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes.

actionmailer/README.rdoc

@@ -67,12 +67,12 @@ simply call the method and optionally call +deliver+ on the return value.
 
 Calling the method returns a Mail Message object:
 
-  message = Notifier.welcome  # => Returns a Mail::Message object
-  message.deliver             # => delivers the email
+  message = Notifier.welcome("david@loudthinking.com")  # => Returns a Mail::Message object
+  message.deliver                                       # => delivers the email
 
 Or you can just chain the methods together like:
 
-  Notifier.welcome.deliver    # Creates the email and sends it immediately
+  Notifier.welcome("david@loudthinking.com").deliver    # Creates the email and sends it immediately
 
 == Setting defaults
 
@@ -119,8 +119,7 @@ trivial case like this:
   rails runner 'Mailman.receive(STDIN.read)'
 
 However, invoking Rails in the runner for each mail to be received is very resource intensive.  A single
-instance of Rails should be run within a daemon, if it is going to be utilized to process more than just
-a limited number of email.
+instance of Rails should be run within a daemon, if it is going to process more than just a limited amount of email.
 
 == Configuration
 

actionmailer/lib/action_mailer/base.rb

@@ -334,8 +334,8 @@ module ActionMailer
   #     and starts to use it.
   #   * <tt>:openssl_verify_mode</tt> - When using TLS, you can set how OpenSSL checks the certificate. This is
   #     really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name
-  #     of an OpenSSL verify constant ('none', 'peer', 'client_once','fail_if_no_peer_cert') or directly the
-  #     constant  (OpenSSL::SSL::VERIFY_NONE, OpenSSL::SSL::VERIFY_PEER,...).
+  #     of an OpenSSL verify constant ('none', 'peer', 'client_once', 'fail_if_no_peer_cert') or directly the
+  #     constant  (OpenSSL::SSL::VERIFY_NONE, OpenSSL::SSL::VERIFY_PEER, ...).
   #
   # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method.
   #   * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.
@@ -596,9 +596,9 @@ def attachments
     # class method:
     #
     #  class Notifier < ActionMailer::Base
-    #    self.default from: 'no-reply@test.lindsaar.net',
-    #                 bcc: 'email_logger@test.lindsaar.net',
-    #                 reply_to: 'bounces@test.lindsaar.net'
+    #    default from: 'no-reply@test.lindsaar.net',
+    #            bcc: 'email_logger@test.lindsaar.net',
+    #            reply_to: 'bounces@test.lindsaar.net'
     #  end
     #
     # If you need other headers not listed above, you can either pass them in

actionmailer/lib/action_mailer/version.rb

@@ -1,7 +1,7 @@
 module ActionMailer
   # Returns the version of the currently loaded ActionMailer as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.0.beta1"
+    Gem::Version.new "4.1.0.beta"
   end
 
   module VERSION #:nodoc: