aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* Fix Action Mailer changelog indenation to match other changelogsCarlos Antonio da Silva2012-12-191-23/+23
| | | | Also some minor improvements to other changelogs. [ci skip]
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-151-1/+1
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb railties/lib/rails/info_controller.rb
| * use default_options= instead of default to avoid confusionFrancesco Rodriguez2012-12-091-1/+1
| |
* | Convert changelogs to 1.9 hash style and fix some formatting [ci skip]Carlos Antonio da Silva2012-12-141-2/+2
| |
* | Remove not used variable warnings from AM and ACCarlos Antonio da Silva2012-12-111-2/+1
| |
* | Merge pull request #8450 from senny/8448_mailer_return_valuesRafael Mendonça França2012-12-104-2/+16
|\ \ | | | | | | the return value of mailer methods should not be relevant
| * | The return value from mailer methods is not relevant.Yves Senn2012-12-104-2/+16
| | |
* | | Revert "Omit directories from gemspec.files for RubyGems 2 compat."Jeremy Kemper2012-12-091-1/+1
| | | | | | | | | | | | | | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25.
* | | Omit directories from gemspec.files for RubyGems 2 compat.Jeremy Kemper2012-12-081-1/+1
| |/ |/| | | | | | | | | RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir. May revert if rubygems/rubygems#413 is accepted.
* | use _action callbacks in actionmailerFrancesco Rodriguez2012-12-084-14/+14
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-041-2/+0
|\ \ | |/ |/| | | | | Conflicts: guides/source/migrations.md
| * Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-011-2/+0
| |
* | Bump mailer to quiet the stdout log messagesJeremy Kemper2012-12-031-1/+1
|/
* Tiny refactorSantiago Pastorino2012-11-291-4/+1
|
* Explicit multipart messages respect :parts_orderNate Berkopec2012-11-193-29/+30
| | | | | | | | | 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.
* make ActionMailer::QueuedMessage autoloadableYves Senn2012-11-181-0/+1
|
* Upgrade mail dependency to 2.5.2Mikel Lindsaar2012-11-181-1/+1
|
* Upgrade mail dependency to 2.5.0Mikel Lindsaar2012-11-181-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-171-9/+9
|\ | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * Actionmailer to 1.9 hash syntaxAvnerCohen2012-11-081-9/+9
| |
* | Clean up gemspecsVinny Diehl2012-11-081-7/+10
|/ | | | | | | | | | 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.
* Revert "Support `Mailer.deliver_foo(*args)` as a synonym for ↵Jon Leighton2012-10-303-15/+0
| | | | | | | | | | | | `Mailer.foo(*args).deliver`." This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8. Conflicts: actionmailer/CHANGELOG.md See discussion at https://github.com/rails/rails/commit/7e0cf563639bc7508da381b1b8321c7a89be1aa8#commitcomment-2075489
* Do not render views when mail() isn't called. (NullMail refactoring)Yves Senn2012-10-285-1/+28
|
* Remove old asset_path from rails configJoshua Peek2012-10-151-1/+0
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-111-8/+8
|\ | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
| * Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev)Robin Dupret2012-10-101-8/+8
| |
| * Revert "Add changelog/release note entries for missing ActionMailer super ↵Aditya Sanghi2012-10-101-3/+0
| | | | | | | | | | | | feature related to inclusion of callbacks in mailers" This reverts commit f16ec8c864ba12c2315713af76b11be5887cfa3a.
| * Add changelog/release note entries for missing ActionMailer super feature ↵Aditya Sanghi2012-10-101-0/+3
| | | | | | | | related to inclusion of callbacks in mailers
* | Add missing CHANGELOG related to addition of callbacks to mailers.Aditya Sanghi2012-10-101-0/+4
| |
* | Update test locationsMike Moore2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | Update actionmailer with new hash syntax.Kirill Nikitin2012-10-0715-169/+169
| |
* | Merge pull request #7708 from bdurand/optimize_log_subscribersRafael Mendonça França2012-10-011-2/+4
|\ \ | |/ |/| Optimize log subscribers to check if the log level is sufficient
| * Optimize log subscribers to check if the log level is sufficient before ↵Brian Durand2012-09-301-2/+4
| | | | | | | | performing an operations.
* | Support `Mailer.deliver_foo(*args)` as a synonym for ↵Jon Leighton2012-09-283-0/+15
| | | | | | | | | | | | | | `Mailer.foo(*args).deliver`. This makes it easy to write e.g. `Mailer.expects(:deliver_foo)` when testing code that calls the mailer.
* | Also includes ConstantLookup dependency for controller and mailer testsAndy Lindeman2012-09-261-0/+1
| |
* | Support mailer tests using spec DSLMike Moore2012-09-242-3/+149
| | | | | | | | | | Improve how mailer tests to resolve mailers from the test name. Add tests for mailer tests using the minitest spec DSL.
* | Register mailer tests for minitest's spec DSLMike Moore2012-09-242-0/+44
| |
* | Revert "update ActionMailer::Base documentation [ci skip]"Rafael Mendonça França2012-09-211-258/+216
| | | | | | | | | | | | | | | | | | | | This reverts commit f5654e78b248ecc90e8556366c927e1176c2428f. 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
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-216-238/+275
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * remove nodoc [ci skip]Vijay Dev2012-09-211-1/+1
| |
| * fix Hash#slice code example [ci skip]Francesco Rodriguez2012-09-181-1/+1
| |
| * update ActionMailer documentation [ci skip]Francesco Rodriguez2012-09-175-18/+15
| |
| * update ActionMailer::Base documentation [ci skip]Francesco Rodriguez2012-09-171-266/+323
| |
* | spurious space I saw in passingXavier Noria2012-09-181-1/+1
| |
* | Use synchronous queue by default. Separate queued message delivery jobs from ↵Jeremy Kemper2012-09-165-27/+30
| | | | | | | | the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage).
* | Move queue classes to ActiveSupportSantiago Pastorino2012-09-142-4/+4
| |
* | Updating the documentation to ActionMailer::Base.queueRafael Mendonça França2012-09-121-0/+3
| |
* | Allow users to configure the queue for the mailersRafael Mendonça França2012-09-123-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | This allow the users to do: config.action_mailer.queue = MyQueue.new and class UsersMailer < ActionMailer::Base self.queue = MyQueue.new end
* | Action Mailer async flag is true by default using a Synchronous implSantiago Pastorino2012-09-116-61/+51
|/
* fix bad changelog exampleAditya Sanghi2012-09-071-1/+1
|