Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Revert "Support `Mailer.deliver_foo(*args)` as a synonym for ↵ | Jon Leighton | 2012-10-30 | 1 | -3/+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 Senn | 2012-10-28 | 1 | -1/+13 | |
| | ||||||
* | Update actionmailer with new hash syntax. | Kirill Nikitin | 2012-10-07 | 1 | -42/+42 | |
| | ||||||
* | Support `Mailer.deliver_foo(*args)` as a synonym for ↵ | Jon Leighton | 2012-09-28 | 1 | -0/+3 | |
| | | | | | | | `Mailer.foo(*args).deliver`. This makes it easy to write e.g. `Mailer.expects(:deliver_foo)` when testing code that calls the mailer. | |||||
* | Revert "update ActionMailer::Base documentation [ci skip]" | Rafael Mendonça França | 2012-09-21 | 1 | -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/docrails | Vijay Dev | 2012-09-21 | 1 | -220/+260 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Dev | 2012-09-21 | 1 | -1/+1 | |
| | | ||||||
| * | fix Hash#slice code example [ci skip] | Francesco Rodriguez | 2012-09-18 | 1 | -1/+1 | |
| | | ||||||
| * | update ActionMailer::Base documentation [ci skip] | Francesco Rodriguez | 2012-09-17 | 1 | -266/+323 | |
| | | ||||||
* | | spurious space I saw in passing | Xavier Noria | 2012-09-18 | 1 | -1/+1 | |
| | | ||||||
* | | Use synchronous queue by default. Separate queued message delivery jobs from ↵ | Jeremy Kemper | 2012-09-16 | 1 | -0/+2 | |
| | | | | | | | | the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage). | |||||
* | | Updating the documentation to ActionMailer::Base.queue | Rafael Mendonça França | 2012-09-12 | 1 | -0/+3 | |
| | | ||||||
* | | Allow users to configure the queue for the mailers | Rafael Mendonça França | 2012-09-12 | 1 | -5/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 impl | Santiago Pastorino | 2012-09-11 | 1 | -16/+12 | |
|/ | ||||||
* | Allow delivery method options to be set per mail instance | Aditya Sanghi | 2012-09-04 | 1 | -1/+1 | |
| | ||||||
* | Fixes warnings when executing rake test in ActionMailer. Related to ↵ | kennyj | 2012-08-29 | 1 | -1/+1 | |
| | | | | 582a7f459990487659886b90e54c22e055c65870 | |||||
* | Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail" | José Valim | 2012-08-07 | 1 | -1/+1 | |
| | | | | | | 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. | |||||
* | Merge pull request #7202 from asanghi/perform_deliveries_in_mail | José Valim | 2012-08-04 | 1 | -1/+1 | |
|\ | | | | | Allow perform_deliveries to be set within mailer action | |||||
| * | allow perform deliveries to be set within mailer action | Aditya Sanghi | 2012-07-30 | 1 | -1/+1 | |
| | | ||||||
* | | load active_support/core_ext/object/blank in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 | |
|/ | ||||||
* | Improve docs, changelog and release notes for Action Mailer default_options= | Carlos Antonio da Silva | 2012-07-06 | 1 | -2/+8 | |
| | | | | [ci skip] | |||||
* | Introduce config.action_mailer.default_from= | Robert Pankowecki | 2012-07-03 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = {from:"no-replay@example.org"} This was not possible using #default method because config.action_mailer.default(from: "no-replay@example.org") is interpreated as reader method and just returns nil. It would not call ActionMailer::Base.default method. The only way of calling this method from config/application.rb was to use the direct syntax which looks ugly in my opinion: config.assets.enabled = false config.assets.version = '1.0' config.encoding = "utf-8" config.action_mailer.default_url_options= { host:"example.org", protocol:"https" } ActionMailer::Base.default(from: "no-replay@example.org") | |||||
* | fix ActionMailer::Async docs and update to follow coding conventions | Francesco Rodriguez | 2012-06-28 | 1 | -3/+3 | |
| | ||||||
* | Better documentation for ActionMailer.async | Brian Cardarella | 2012-06-24 | 1 | -2/+2 | |
| | ||||||
* | Better documentation for ActionMailer.async | Brian Cardarella | 2012-06-24 | 1 | -0/+4 | |
| | ||||||
* | Support for custom queues on the mailer | Brian Cardarella | 2012-06-23 | 1 | -1/+1 | |
| | | | | Credit goes to *Aaron Patterson* (tenderlove) | |||||
* | AsyncMailer documention | Brian Cardarella | 2012-06-23 | 1 | -0/+1 | |
| | ||||||
* | Asynchronous ActionMailer | Brian Cardarella | 2012-06-23 | 1 | -0/+7 | |
| | | | | | | | | Any ActionMailer class can be set to render and delier messages using the new Rails Queue. Some of this work was borrowed (with permission) from Nick Plante's (zapnap) reqsue_mailer gem. | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-06-22 | 1 | -1/+1 | |
|\ | ||||||
| * | just specify what's to be done, not what's not to be. | Damien Mathieu | 2012-06-20 | 1 | -1/+1 | |
| | | ||||||
| * | Fix delivery_method usage | Ben Oakes | 2012-06-20 | 1 | -1/+1 | |
| | | ||||||
* | | raise an error if no implicit mailer template could be found | Damien Mathieu | 2012-06-20 | 1 | -3/+19 | |
|/ | ||||||
* | mailer can be anonymous | Sergey Nartimov | 2012-05-13 | 1 | -1/+2 | |
| | | | | closes #5970 | |||||
* | Fix it's -> its | Mark Rushakoff | 2012-04-27 | 1 | -1/+1 | |
| | ||||||
* | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+ | Mark Rushakof | 2012-04-27 | 1 | -1/+1 | |
| | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+) | |||||
* | Updated/changed useless tr/gsubs | Jurriaan Pruis | 2012-04-03 | 1 | -1/+1 | |
| | ||||||
* | Updates ActionMailer Base summary and fixes space in code example. | Charles Brian Quinn | 2012-03-19 | 1 | -4/+4 | |
| | ||||||
* | Add ability to define callbacks in ActionMailer using ↵ | Justin S. Leitgeb | 2012-03-11 | 1 | -0/+28 | |
| | | | | | | | | | | | | | | | | | AbstractController::Callbacks. Prior to this commit, there isn't a good way of adding things like default inline attachments to an email. This Stack Overflow thread shows people using hooks like the 'default' method in ActionMailer::Base to call a Proc for message configuration: http://stackoverflow.com/questions/5113121/rails-use-same-attachment-for-all-emails-using-layout This has the unintended side effect of setting a message header, so it's not a good solution. This pull request adds support for message modifications by including AbstractController:Callbacks in ActionMailer::Base. It includes tests and documentation for the functionality provided by including this module. | |||||
* | Use instance_eval instead of Proc#bind | Sergey Nartimov | 2012-01-23 | 1 | -2/+1 | |
| | | | | Proc#bind is not useful when called immediately and previous check for #call method is not correct | |||||
* | Merge pull request #4605 from lest/patch-1 | José Valim | 2012-01-22 | 1 | -3/+0 | |
|\ | | | | | remove obsolete code as old actionmailer api was removed | |||||
| * | remove obsolete code as old actionmailer api was removed | Sergey Nartimov | 2012-01-22 | 1 | -3/+0 | |
| | | ||||||
* | | some modifications in action_mailer/base.rb | Sachin87 | 2012-01-22 | 1 | -2/+3 | |
|/ | ||||||
* | get rid of using instance_variable_names method from AS | Sergey Nartimov | 2012-01-07 | 1 | -1/+1 | |
| | | | | | - instance_variables return symbols in 1.9 - there is instance_variable_defined? method | |||||
* | Array.wrap is no longer needed here | Rafael Mendonça França | 2012-01-05 | 1 | -7/+6 | |
| | ||||||
* | use Array#uniq in AM instead of deprecated Array#uniq_by | Sergey Nartimov | 2011-12-24 | 1 | -1/+1 | |
| | ||||||
* | fix default_i18n_subject comment in ActionMailer::Base | Indrek Juhkam | 2011-12-20 | 1 | -1/+1 | |
| | ||||||
* | Correct ActionMailer subject i18n lookup scope. | Andrew France | 2011-10-20 | 1 | -1/+1 | |
| | | | The :actionmailer i18n scope part is not used and according to https://github.com/rails/rails/pull/2542 the implementation is correct. | |||||
* | update ActionMailer example using last truncate helper method signature | Alexey Vakhov | 2011-09-26 | 1 | -2/+2 | |
| | ||||||
* | grammar (missing "a") and formatting | Matt Jankowski | 2011-06-21 | 1 | -3/+3 | |
| | ||||||
* | clarify why the only_path => false option is needed when default :host has ↵ | Matt Jankowski | 2011-06-21 | 1 | -4/+4 | |
| | | | | been set for mailers |