Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 29, 2013
  1. @carlosantoniodasilva
Commits on Jan 24, 2013
  1. @exviva

    Allow passing interpolations to `#default_i18n_subject`, e.g.:

    exviva authored
        # 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
Commits on Jan 3, 2013
  1. @robin850
Commits on Dec 22, 2012
  1. @jeremy
Commits on Dec 15, 2012
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev authored
    Conflicts:
    	actionpack/lib/action_view/helpers/form_helper.rb
    	railties/lib/rails/info_controller.rb
Commits on Dec 12, 2012
  1. @carlosantoniodasilva
Commits on Dec 10, 2012
  1. @rafaelfranca

    Merge pull request #8450 from senny/8448_mailer_return_values

    rafaelfranca authored
    the return value of mailer methods should not be relevant
  2. @senny
Commits on Dec 9, 2012
  1. use default_options= instead of default to avoid confusion

    Francesco Rodriguez authored
Commits on Dec 8, 2012
  1. use _action callbacks in actionmailer

    Francesco Rodriguez authored
Commits on Dec 1, 2012
  1. @alvaropereyra
Commits on Nov 29, 2012
  1. @spastorino

    Tiny refactor

    spastorino authored
Commits on Nov 19, 2012
  1. @nateberkopec

    Explicit multipart messages respect :parts_order

    nateberkopec authored
    As issue #7978, the order in which ActionMailer
    sends multipart messages could be unintentionally
    overwritten if a block is passed to the mail
    method. This changes the mail method such that
    :parts_order is always respected, regardless of
    whether a block is passed to mail.
Commits on Nov 8, 2012
  1. @AvnerCohen
Commits on Oct 30, 2012
  1. @jonleighton

    Revert "Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.…

    jonleighton authored
    …foo(*args).deliver`."
    
    This reverts commit 7e0cf56.
    
    Conflicts:
    	actionmailer/CHANGELOG.md
    
    See discussion at
    7e0cf56#commitcomment-2075489
Commits on Oct 28, 2012
  1. @senny
Commits on Oct 7, 2012
  1. @Locke23rus
Commits on Sep 28, 2012
  1. @jonleighton

    Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.foo(*arg…

    jonleighton authored
    …s).deliver`.
    
    This makes it easy to write e.g. `Mailer.expects(:deliver_foo)` when
    testing code that calls the mailer.
Commits on Sep 21, 2012
  1. @rafaelfranca

    Revert "update ActionMailer::Base documentation [ci skip]"

    rafaelfranca authored
    This reverts commit f5654e7.
    
    Conflicts:
    	actionmailer/lib/action_mailer/base.rb
    
    Reason: @frodsan asked me to revert since this change is breaking the
    documentation in the edge API site
  2. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev authored
    Conflicts:
    	actionmailer/lib/action_mailer/base.rb
    	activesupport/lib/active_support/configurable.rb
    	activesupport/lib/active_support/core_ext/module/deprecation.rb
    	guides/source/action_controller_overview.md
    	guides/source/active_support_core_extensions.md
    	guides/source/ajax_on_rails.textile
    	guides/source/association_basics.textile
    	guides/source/upgrading_ruby_on_rails.md
    
    While resolving conflicts, I have chosen to ignore changes done in
    docrails at some places - these will be most likely 1.9 hash syntax
    changes.
  3. @vijaydev

    remove nodoc [ci skip]

    vijaydev authored
Commits on Sep 19, 2012
  1. fix Hash#slice code example [ci skip]

    Francesco Rodriguez authored
Commits on Sep 18, 2012
  1. @fxn

    spurious space I saw in passing

    fxn authored
Commits on Sep 17, 2012
  1. update ActionMailer::Base documentation [ci skip]

    Francesco Rodriguez authored
  2. @jeremy

    Use synchronous queue by default. Separate queued message delivery jo…

    jeremy authored
    …bs from the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage).
Commits on Sep 12, 2012
  1. @rafaelfranca
  2. @rafaelfranca

    Allow users to configure the queue for the mailers

    rafaelfranca authored
    This allow the users to do:
    
        config.action_mailer.queue = MyQueue.new
    
    and
    
        class UsersMailer < ActionMailer::Base
          self.queue = MyQueue.new
        end
Commits on Sep 11, 2012
  1. @spastorino
Commits on Sep 4, 2012
  1. @asanghi
Commits on Aug 28, 2012
  1. @kennyj
Commits on Aug 7, 2012
  1. @josevalim

    Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_m…

    josevalim authored
    …ail"
    
    Reverting because it feels backward to specify a delivery to not
    be performed while the e-mail is being composed. It is simpler (and
    makes more sense) to delegate the responsibility to the calling code.
Commits on Aug 4, 2012
  1. @josevalim

    Merge pull request #7202 from asanghi/perform_deliveries_in_mail

    josevalim authored
    Allow perform_deliveries to be set within mailer action
Commits on Aug 2, 2012
  1. @fxn
Commits on Jul 30, 2012
  1. @asanghi
Commits on Jul 7, 2012
  1. @carlosantoniodasilva
Something went wrong with that request. Please try again.