aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
Commit message (Collapse)AuthorAgeFilesLines
...
* don't convert mailer default values to procsAlex Tsukernik2013-07-221-1/+1
| | | | | | Invoke mailer defaults as procs only if they are procs, do not convert with to_proc. That an object is convertible to a proc does not mean it's meant to be always used as a proc. Fixes #11533
* Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"Vijay Dev2013-05-191-1/+1
| | | | | | | | This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa. Reason: Let's not nodoc without reason. [ci skip]
* Fix documentation for ActionMailer template names.Megan Bowra-Dean2013-05-171-4/+4
| | | | ActionMailer templates that are not plain text do not require *.text.* in the name and will fail to be picked up automatically if it is included in the name.
* nodoc ActionMailer module from lib/action_mailer/*.rbZachary Scott2013-05-151-1/+1
|
* Document ActionMailer::Base#set_content_typeZachary Scott2013-05-121-0/+9
|
* RDoc style for ActionMailer::Base#mailZachary Scott2013-05-101-23/+25
|
* Document ActionMailer::Base::default, ::mailer_name, and #mailer_nameZachary Scott2013-05-101-14/+25
|
* Fix grammar on AM.mailer_name documentation.Hendy Tanata2013-05-061-1/+1
|
* Add some documentation for AM.mailer_namePrem Sichanugrist2013-05-031-0/+2
|
* Remove superfluous `self.` in Action Mailer mail method documetationAlexey Vakhov2013-04-231-3/+3
| | | | | | Notation with `self` was sugestted at 0b05acd, when self.defaults was extlib_inheritable_accessor. But now all Action Mailer examples are without this self. It's nicer.
* Cosmetic fixes in AM::Base docs. Missed spaces in OpenSSL constants ↵Alexey Vakhov2013-04-231-2/+2
| | | | | | enumerations. Injected at a1639ad.
* Send paths argument as an array rather than converting it internallyCarlos Antonio da Silva2013-01-281-3/+3
|
* Allow passing interpolations to `#default_i18n_subject`, e.g.:Olek Janiszewski2013-01-241-2/+3
| | | | | | | | | | | | | | | # config/locales/en.yml en: user_mailer: welcome: subject: 'Hello, %{username}' # app/mailers/user_mailer.rb class UserMailer < ActionMailer::Base def welcome(user) mail(subject: default_i18n_subject(username: user.name)) end end
* Fix missing spaces before and after equal signs in method definitionsRobin Dupret2013-01-031-2/+2
|
* Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵Jeremy Kemper2012-12-211-9/+2
| | | | with Rails 4.0.
* 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
| |
* | 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-101-1/+4
|\ \ | |/ |/| the return value of mailer methods should not be relevant
| * The return value from mailer methods is not relevant.Yves Senn2012-12-101-1/+4
| |
* | use _action callbacks in actionmailerFrancesco Rodriguez2012-12-081-4/+4
| |
* | Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-011-2/+0
|/
* Tiny refactorSantiago Pastorino2012-11-291-4/+1
|
* Explicit multipart messages respect :parts_orderNate Berkopec2012-11-191-8/+6
| | | | | | | | | 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.
* Actionmailer to 1.9 hash syntaxAvnerCohen2012-11-081-9/+9
|
* Revert "Support `Mailer.deliver_foo(*args)` as a synonym for ↵Jon Leighton2012-10-301-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 Senn2012-10-281-1/+13
|
* 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
|