| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Register mailer tests for minitest's spec DSL | Mike Moore | 2012-09-24 | 2 | -0/+44 | |
| | | | ||||||
| * | | 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 | 6 | -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 Dev | 2012-09-21 | 1 | -1/+1 | |
| | | | ||||||
| | * | fix Hash#slice code example [ci skip] | Francesco Rodriguez | 2012-09-18 | 1 | -1/+1 | |
| | | | ||||||
| | * | update ActionMailer documentation [ci skip] | Francesco Rodriguez | 2012-09-17 | 5 | -18/+15 | |
| | | | ||||||
| | * | 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 | 5 | -27/+30 | |
| | | | | | | | | | the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage). | |||||
| * | | Move queue classes to ActiveSupport | Santiago Pastorino | 2012-09-14 | 2 | -4/+4 | |
| | | | ||||||
| * | | 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 | 3 | -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 impl | Santiago Pastorino | 2012-09-11 | 6 | -61/+51 | |
| |/ | ||||||
| * | fix bad changelog example | Aditya Sanghi | 2012-09-07 | 1 | -1/+1 | |
| | | ||||||
| * | Allow delivery method options to be set per mail instance | Aditya Sanghi | 2012-09-04 | 4 | -3/+58 | |
| | | ||||||
| * | Added missing require. When performing rake test:isolated, test/base_test.rb ↵ | kennyj | 2012-08-29 | 1 | -0/+1 | |
| | | | | | was break. | |||||
| * | CHANGELOGs are now per branch | Xavier Noria | 2012-08-28 | 1 | -533/+1 | |
| | | | | | | | | | | | Changes in old branches needed to be manually synched in CHANGELOGs of newer ones. This has proven to be brittle, sometimes one just forgets this manual step. With this commit we switch to CHANGELOGs per branch. When a new major version is cut from master, the CHANGELOGs in master start being blank. A link to the CHANGELOG of the previous branch allows anyone interested to follow the history. | |||||
| * | Fixes warnings when executing rake test in ActionMailer. Related to ↵ | kennyj | 2012-08-29 | 1 | -1/+1 | |
| | | | | | 582a7f459990487659886b90e54c22e055c65870 | |||||
| * | Fix ActionMailer tests that depend on run order | Francesco Rodriguez | 2012-08-23 | 1 | -5/+9 | |
| | | ||||||
| * | Get rid of config.preload_frameworks in favor of config.eager_load_namespaces | José Valim | 2012-08-21 | 2 | -1/+5 | |
| | | | | | | | | The new option allows any Ruby namespace to be registered and set up for eager load. We are effectively exposing the structure existing in Rails since v3.0 for all developers in order to make their applications thread-safe and CoW friendly. | |||||
| * | Sync CHANGELOGs [ci skip] | Rafael Mendonça França | 2012-08-11 | 1 | -0/+16 | |
| | | ||||||
| * | Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail" | José Valim | 2012-08-07 | 4 | -23/+3 | |
| | | | | | | | 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. | |||||
| * | add changelog for #7202 | Aditya Sanghi | 2012-08-07 | 1 | -0/+7 | |
| | | ||||||
| * | Merge pull request #7202 from asanghi/perform_deliveries_in_mail | José Valim | 2012-08-04 | 3 | -3/+16 | |
| |\ | | | | | Allow perform_deliveries to be set within mailer action | |||||
| | * | allow perform deliveries to be set within mailer action | Aditya Sanghi | 2012-07-30 | 3 | -3/+16 | |
| | | | ||||||
| * | | load active_support/core_ext/module/delegation in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 | |
| | | | ||||||
| * | | load active_support/core_ext/class/attribute in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 | |
| | | | ||||||
| * | | load active_support/core_ext/object/blank in active_support/rails | Xavier Noria | 2012-08-02 | 2 | -2/+0 | |
| | | | ||||||
| * | | defines a private require-hub active_support/rails | Xavier Noria | 2012-08-02 | 1 | -0/+1 | |
| |/ | | | | | | | | This is a private place to put those AS features that are used by every component. Nowadays we cherry-pick individual files wherever they are used, but that it is not worth the effort for stuff that is going to be loaded for sure sooner or later, like blank?, autoload, concern, etc. | |||||
| * | Fix failing AM test due to missing template | Carlos Antonio da Silva | 2012-07-06 | 1 | -1/+1 | |
| | | ||||||
| * | Improve docs, changelog and release notes for Action Mailer default_options= | Carlos Antonio da Silva | 2012-07-06 | 2 | -4/+10 | |
| | | | | | [ci skip] | |||||
| * | Merge pull request #6950 from paneq/default_from2 | Carlos Antonio da Silva | 2012-07-06 | 3 | -1/+19 | |
| |\ | | | | | | | | | | | | | | | | | | | Introduce config.action_mailer.default_options= 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" } Closes #6747 | |||||
| | * | Introduce config.action_mailer.default_from= | Robert Pankowecki | 2012-07-03 | 3 | -1/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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") | |||||
| * | | Use ArgumentError vs. RuntimeError, which is more precise. | Mark Dodwell | 2012-07-04 | 1 | -1/+1 | |
| |/ | ||||||
| * | fix ActionMailer::Async docs and update to follow coding conventions | Francesco Rodriguez | 2012-06-28 | 2 | -31/+33 | |
| | | ||||||
| * | Some final syntax fixes | Brian Cardarella | 2012-06-24 | 2 | -3/+2 | |
| | | ||||||
| * | 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 | |
| | | ||||||
| * | Forcing the message sending is no longer necessary | Brian Cardarella | 2012-06-24 | 2 | -16/+1 | |
| | | ||||||
| * | Support for custom queues on the mailer | Brian Cardarella | 2012-06-23 | 3 | -18/+30 | |
| | | | | | Credit goes to *Aaron Patterson* (tenderlove) | |||||
| * | Removed unecessary splatting | Brian Cardarella | 2012-06-23 | 1 | -1/+1 | |
| | | ||||||
| * | Use Delegator for a cleaner QueuedMessage class | Brian Cardarella | 2012-06-23 | 1 | -13/+8 | |
| | | | | | Credit goes to *Nicolás Sanguinetti* (foca) for this suggestion | |||||
| * | Updated Changelogs | Brian Cardarella | 2012-06-23 | 1 | -0/+2 | |
| | | ||||||
| * | Force message delivery despite async | Brian Cardarella | 2012-06-23 | 2 | -2/+16 | |
| | | ||||||
| * | AsyncMailer documention | Brian Cardarella | 2012-06-23 | 2 | -0/+3 | |
| | | ||||||
| * | Asynchronous ActionMailer | Brian Cardarella | 2012-06-23 | 5 | -0/+66 | |
| | | | | | | | | | 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 | 11 | -3/+30 | |
| |/ | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionmailer