Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 7, 2015
  1. @kaspth

    Revert "Merge pull request #20758 from xijo/action_mailer_message_del…

    kaspth authored
    …ivery_respects_i18n_locale"
    
    This reverts commit f2a8c23, reversing
    changes made to 3046c9b.
Commits on Jul 5, 2015
  1. @xijo

    ActionMailer::MessageDelivery respects current I18n.locale

    xijo authored
    When #deliver_now is called all translations within the
    generated email will be looked up for the current I18n
    locale.
    
        I18n.locale = ‘de’
        mail.deliver_now # Generates german email, correct
    
    In #enqueue_delivery the locale was not considered and
    the resulting job uses the default locale.
    
        I18n.locale = ‘de’
        mail.deliver_later # Generate english email, incorrect
    
    In order to achieve a consistent behaviour the current locale
    is now always passed to `ActionMailer::DeliveryJob`.
Commits on Jun 9, 2015
  1. @robin850
Commits on Jun 3, 2015
  1. @rafaelfranca

    Merge pull request #18587 from chrismcg/allow_deliver_later_queue_nam…

    rafaelfranca authored
    …e_to_be_configured
    
    Allow configuration of ActionMailer queue name
Commits on Jun 2, 2015
  1. @chrismcg
Commits on May 29, 2015
  1. @rafaelfranca

    Make the wording less confusing

    rafaelfranca authored
    This partially reverts commit ac02df5.
    
    [ci skip]
  2. @manishspuri

    minor text change

    manishspuri authored
  3. @manishspuri
Commits on May 17, 2015
  1. @gouravtiwari
Commits on May 9, 2015
  1. @y-yagi
Commits on May 4, 2015
  1. @pixeltrix

    Document inline image mailer preview interceptor

    pixeltrix authored
    Explain what the interceptor is used for and how to remove it.
  2. @pixeltrix

    Add support for inline images to mailer previews

    pixeltrix authored
    Use a preview interceptor to search for inline cid: urls in src
    attributes and convert them to data urls.
Commits on Apr 28, 2015
  1. @senny
  2. @axilleas

    AUTH PLAIN is Base64 encoded [ci skip]

    axilleas authored
    Contrary to what the name suggests, PLAIN SMTP authentication is not
    sent in plain text but is Base64 encoded like the LOGIN method. Their
    difference is described in the third link below.
    
    * https://tools.ietf.org/html/rfc4954
    * https://en.wikipedia.org/wiki/SMTP_Authentication
    * http://www.samlogic.net/articles/smtp-commands-reference-auth.htm
Commits on Apr 12, 2015
  1. @zzak
  2. @zzak

    Merge branch 'action-mailer-async-doc-fixes' of https://github.com/mf…

    zzak authored
    …azekas/rails into mfazekas-action-mailer-async-doc-fixes
    
    Conflicts:
    	actionmailer/lib/action_mailer/base.rb
Commits on Mar 15, 2015
  1. @davydovanton
Commits on Mar 2, 2015
  1. @davydovanton
Commits on Feb 25, 2015
  1. @y-yagi
Commits on Feb 15, 2015
  1. @davydovanton
Commits on Jan 14, 2015
  1. @rafaelfranca

    Merge pull request #18521 from andrewvida/master

    rafaelfranca authored
    Correct the views that the mail method sends in API docs.
  2. @andrewvida
Commits on Jan 8, 2015
  1. @georgeclaghorn
Commits on Jan 4, 2015
  1. @rafaelfranca

    Remove unneeded requires

    rafaelfranca authored
    These requires were added only to change deprecation message
  2. @claudiob @rafaelfranca

    Remove deprecated ActionMailer deliver & deliver!

    claudiob authored rafaelfranca committed
    These methods were deprecated in Rails 4.2 (see f4ee114) so they can
    be safely removed in Rails 5.0.
Commits on Dec 30, 2014
  1. @rafaelfranca

    Template lookup now respect default locale and I18n fallbacks.

    rafaelfranca authored
    Given the following templates:
    
        mailer/demo.html.erb
        mailer/demo.en.html.erb
        mailer/demo.pt.html.erb
    
    Before this change for a locale that doesn't have its related file
    the `mailer/demo.html.erb` will
    be rendered even if `en` is the default locale.
    
    Now `mailer/demo.en.html.erb` has precedence over the file without
     locale.
    
    Also, it is possible to give a fallback.
    
        mailer/demo.pt.html.erb
        mailer/demo.pt-BR.html.erb
    
    So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be
     rendered given the right I18n fallback configuration.
    
    Fixes #11884.
Commits on Dec 23, 2014
  1. @senny

    Merge pull request #18163 from y-yagi/fix_nodoc_typo

    senny authored
    fix typo in nodoc [ci skip]
  2. @y-yagi

    fix typo in nodoc

    y-yagi authored
Commits on Dec 18, 2014
  1. @mfazekas
Commits on Dec 3, 2014
  1. @GBH
Commits on Dec 1, 2014
  1. @2called-chaos

    Fix documentation for #default

    2called-chaos authored
    Just a little syntax error I spotted by accident. Cannot pass hash with curly braces without normal parentheses.
Commits on Nov 30, 2014
  1. @y-yagi
Commits on Nov 29, 2014
  1. @sferik
Commits on Nov 28, 2014
  1. @rafaelfranca

    Start Rails 5 development :tada:

    rafaelfranca authored
    We will support only Ruby >= 2.1.
    
    But right now we don't accept pull requests with syntax changes to drop
    support to Ruby 1.9.
Commits on Nov 25, 2014
  1. @tgxworld
Something went wrong with that request. Please try again.