Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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 18, 2012
  1. @senny
  2. @mikel

    Upgrade mail dependency to 2.5.2

    mikel authored
Commits on Nov 17, 2012
  1. @mikel

    Upgrade mail dependency to 2.5.0

    mikel authored
Commits on Nov 16, 2012
  1. @vijaydev

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

    vijaydev authored
    Conflicts:
    	actionpack/lib/action_dispatch/routing/redirection.rb
Commits on Nov 9, 2012
  1. Clean up gemspecs

    Vinny Diehl authored
    Organized the gemspec files a bit.
    
     * Made quotes more consistent (single quotes dominated, so I used
       that).
     * Moved license line down a line, separating it logically, and removed
       the extra whitespace before its = operator.
     * Minor whitespace fixes.
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 10, 2012
  1. @vijaydev

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

    vijaydev authored
    Conflicts:
    	activerecord/lib/active_record/persistence.rb
    	railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
  2. @robin850
  3. @asanghi
  4. @asanghi

    Revert "Add changelog/release note entries for missing ActionMailer s…

    asanghi authored
    …uper feature related to inclusion of callbacks in mailers"
    
    This reverts commit f16ec8c.
  5. @asanghi

    Add changelog/release note entries for missing ActionMailer super fea…

    asanghi authored
    …ture related to inclusion of callbacks in mailers
Commits on Oct 9, 2012
  1. @blowmage

    Update test locations

    blowmage authored
    Change the default test locations to avoid confusion around the common
    testing terms "unit" and "functional".
    Add new rake tasks for the new locations, while maintaining backwards
    compatibility with the old rake tasks.
    
    New testing locations are as follows:
    
        app/models -> test/models (was test/units)
        app/helpers -> test/helpers (was test/units/helpers)
        app/controllers -> test/controllers (was test/functional)
        app/mailers -> test/mailers (was test/functional)
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.
  3. @vijaydev

    remove nodoc [ci skip]

    vijaydev authored
Commits on Sep 19, 2012
  1. @frodsan
Commits on Sep 18, 2012
  1. @fxn

    spurious space I saw in passing

    fxn authored
  2. @frodsan
Commits on Sep 17, 2012
  1. @frodsan
  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 14, 2012
  1. @spastorino
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
Something went wrong with that request. Please try again.