aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-171-1/+1
| | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
* | map => map! for stopping extra array creationRajarshi Das2013-08-021-1/+1
|/
* Don't mutate the Base settings by merge!ing the given valueAkira Matsuda2013-07-261-1/+1
|
* 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
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-194-4/+22
|\
| * Revert "ActionMailer::Collector should be nodoc'd"Vijay Dev2013-05-191-1/+1
| | | | | | | | | | | | | | | | This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f. Reason: Let's not nodoc without reason. [ci skip]
| * Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"Vijay Dev2013-05-199-9/+9
| | | | | | | | | | | | | | | | This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa. Reason: Let's not nodoc without reason. [ci skip]
| * Revert "Document Rails::Generators::MailerGenerator"Vijay Dev2013-05-191-4/+2
| | | | | | | | | | | | | | | | This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364. 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.
| * Document Rails::Generators::MailerGeneratorZachary Scott2013-05-151-2/+4
| |
| * nodoc ActionMailer module from lib/action_mailer/*.rbZachary Scott2013-05-159-9/+9
| |
| * Document ActionMailer::MailHelperZachary Scott2013-05-151-0/+3
| |
| * Document ActionMailer::LogSubscriber and ↵Zachary Scott2013-05-152-0/+6
| | | | | | | | ActionMailer::DeliveryMethods::ClassMethods
| * ActionMailer::Collector should be nodoc'dZachary Scott2013-05-151-1/+1
| |
| * Document ActionMailer::Base#set_content_typeZachary Scott2013-05-121-0/+9
| |
* | Extract variable out of loopVipul A M2013-05-131-1/+2
|/
* 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
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-011-5/+5
|\
| * 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.
* | rails/master is now 4.1.0.betaRafael Mendonça França2013-04-291-1/+1
| |
* | Bump version to rc1David Heinemeier Hansson2013-04-291-1/+1
|/
* Add version method to top level modulesCharlie Somerville2013-03-211-6/+7
|
* Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-251-1/+1
|
* 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
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-091-6/+6
|\ | | | | | | | | Conflicts: guides/source/getting_started.md
| * deliver_ is an old APIAkira Matsuda2013-01-041-6/+6
| |
* | Update mailer generator USAGEAkira Matsuda2013-01-061-3/+2
| | | | | | | | | | * it does not generate fixtures * it generates .text.erb templates
* | Fix missing spaces before and after equal signs in method definitionsRobin Dupret2013-01-032-3/+3
|/
* Updated copyright notices for 2013Andrew Nesbitt2012-12-311-1/+1
|
* Inherit from MiniTest::Unit::TestCase instead of MiniTest::SpecRafael Mendonça França2012-12-311-7/+0
|
* Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵Jeremy Kemper2012-12-214-49/+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.
* make ActionMailer::QueuedMessage autoloadableYves Senn2012-11-181-0/+1
|
* 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
|
* Remove old asset_path from rails configJoshua Peek2012-10-151-1/+0
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 09:48:26 +0000