aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
Commit message (Collapse)AuthorAgeFilesLines
* Update actionmailer with new hash syntax.Kirill Nikitin2012-10-071-42/+42
|
* Support `Mailer.deliver_foo(*args)` as a synonym for ↵Jon Leighton2012-09-281-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ç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-211-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 Dev2012-09-211-1/+1
| |
| * fix Hash#slice code example [ci skip]Francesco Rodriguez2012-09-181-1/+1
| |
| * 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-161-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.queueRafael Mendonça França2012-09-121-0/+3
| |
* | Allow users to configure the queue for the mailersRafael Mendonça França2012-09-121-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 implSantiago Pastorino2012-09-111-16/+12
|/
* Allow delivery method options to be set per mail instanceAditya Sanghi2012-09-041-1/+1
|
* Fixes warnings when executing rake test in ActionMailer. Related to ↵kennyj2012-08-291-1/+1
| | | | 582a7f459990487659886b90e54c22e055c65870
* Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"José Valim2012-08-071-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_mailJosé Valim2012-08-041-1/+1
|\ | | | | Allow perform_deliveries to be set within mailer action
| * allow perform deliveries to be set within mailer actionAditya Sanghi2012-07-301-1/+1
| |
* | load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-021-1/+0
|/
* Improve docs, changelog and release notes for Action Mailer default_options=Carlos Antonio da Silva2012-07-061-2/+8
| | | | [ci skip]
* Introduce config.action_mailer.default_from=Robert Pankowecki2012-07-031-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 conventionsFrancesco Rodriguez2012-06-281-3/+3
|
* Better documentation for ActionMailer.asyncBrian Cardarella2012-06-241-2/+2
|
* Better documentation for ActionMailer.asyncBrian Cardarella2012-06-241-0/+4
|
* Support for custom queues on the mailerBrian Cardarella2012-06-231-1/+1
| | | | Credit goes to *Aaron Patterson* (tenderlove)
* AsyncMailer documentionBrian Cardarella2012-06-231-0/+1
|
* Asynchronous ActionMailerBrian Cardarella2012-06-231-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/docrailsVijay Dev2012-06-221-1/+1
|\
| * just specify what's to be done, not what's not to be.Damien Mathieu2012-06-201-1/+1
| |
| * Fix delivery_method usageBen Oakes2012-06-201-1/+1
| |
* | raise an error if no implicit mailer template could be foundDamien Mathieu2012-06-201-3/+19
|/
* mailer can be anonymousSergey Nartimov2012-05-131-1/+2
| | | | closes #5970
* Fix it's -> itsMark Rushakoff2012-04-271-1/+1
|
* Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-271-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/gsubsJurriaan Pruis2012-04-031-1/+1
|
* Updates ActionMailer Base summary and fixes space in code example.Charles Brian Quinn2012-03-191-4/+4
|
* Add ability to define callbacks in ActionMailer using ↵Justin S. Leitgeb2012-03-111-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#bindSergey Nartimov2012-01-231-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-1José Valim2012-01-221-3/+0
|\ | | | | remove obsolete code as old actionmailer api was removed
| * remove obsolete code as old actionmailer api was removedSergey Nartimov2012-01-221-3/+0
| |
* | some modifications in action_mailer/base.rbSachin872012-01-221-2/+3
|/
* get rid of using instance_variable_names method from ASSergey Nartimov2012-01-071-1/+1
| | | | | - instance_variables return symbols in 1.9 - there is instance_variable_defined? method
* Array.wrap is no longer needed hereRafael Mendonça França2012-01-051-7/+6
|
* use Array#uniq in AM instead of deprecated Array#uniq_bySergey Nartimov2011-12-241-1/+1
|
* fix default_i18n_subject comment in ActionMailer::BaseIndrek Juhkam2011-12-201-1/+1
|
* Correct ActionMailer subject i18n lookup scope. Andrew France2011-10-201-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 signatureAlexey Vakhov2011-09-261-2/+2
|
* grammar (missing "a") and formattingMatt Jankowski2011-06-211-3/+3
|
* clarify why the only_path => false option is needed when default :host has ↵Matt Jankowski2011-06-211-4/+4
| | | | been set for mailers
* elaborate details on why to use _url instead of _path in mailersMatt Jankowski2011-06-211-2/+3
|
* typo changesJudeArasu2011-06-191-2/+3
|