Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 24, 2013
  1. @bughit

    don't convert mailer default values to procs

    bughit authored
    Invoke mailer defaults as procs only if they are procs, do not convert
    with to_proc.  That an object is convertible to a proc does not mean it's
    meant to be always used as a proc.  Fixes #11533
    
    Conflicts:
    	actionmailer/CHANGELOG.md
Commits on Jun 26, 2013
  1. @carlosantoniodasilva

    Merge branch '4-0-0' into 4-0-stable

    carlosantoniodasilva authored
    Conflicts:
    	actionpack/CHANGELOG.md
    	activemodel/CHANGELOG.md
    	activerecord/CHANGELOG.md
    	activesupport/CHANGELOG.md
    	guides/source/getting_started.md
    	railties/CHANGELOG.md
Commits on May 1, 2013
  1. Merge branch 4-0-stable of github.com:lifo/docrails [ci skip]

    Francesco Rodriguez authored
Commits on Apr 29, 2013
  1. @dhh

    Bump version to rc1

    dhh authored
Commits on Mar 21, 2013
  1. @charliesome
Commits on Feb 25, 2013
  1. @dhh

    Preparing for 4.0.0.beta1 release

    dhh authored
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 8, 2013
  1. @vijaydev

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

    vijaydev authored
    Conflicts:
    	guides/source/getting_started.md
Commits on Jan 3, 2013
  1. @robin850
  2. @amatsuda

    deliver_ is an old API

    amatsuda authored
Commits on Dec 31, 2012
  1. @rafaelfranca
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 15, 2012
  1. @josh
Commits on Oct 7, 2012
  1. @Locke23rus
Commits on Oct 2, 2012
  1. @rafaelfranca

    Merge pull request #7708 from bdurand/optimize_log_subscribers

    rafaelfranca authored
    Optimize log subscribers to check if the log level is sufficient
Commits on Sep 30, 2012
  1. @bdurand

    Optimize log subscribers to check if the log level is sufficient befo…

    bdurand authored
    …re performing an operations.
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 27, 2012
  1. @alindeman
Commits on Sep 24, 2012
  1. @blowmage

    Support mailer tests using spec DSL

    blowmage authored
    Improve how mailer tests to resolve mailers from the test name.
    Add tests for mailer tests using the minitest spec DSL.
  2. @blowmage
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.
Something went wrong with that request. Please try again.