aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| |
* | Fix missing spaces before and after equal signs in method definitionsRobin Dupret2013-01-032-3/+3
|/
* 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-213-48/+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
|
* Remove old asset_path from rails configJoshua Peek2012-10-151-1/+0
|
* Update actionmailer with new hash syntax.Kirill Nikitin2012-10-073-54/+54
|
* Merge pull request #7708 from bdurand/optimize_log_subscribersRafael Mendonça França2012-10-011-2/+4
|\ | | | | Optimize log subscribers to check if the log level is sufficient
| * Optimize log subscribers to check if the log level is sufficient before ↵Brian Durand2012-09-301-2/+4
| | | | | | | | performing an operations.
* | 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.
* | Also includes ConstantLookup dependency for controller and mailer testsAndy Lindeman2012-09-261-0/+1
| |
* | Support mailer tests using spec DSLMike Moore2012-09-241-3/+5
| | | | | | | | | | Improve how mailer tests to resolve mailers from the test name. Add tests for mailer tests using the minitest spec DSL.
* | Register mailer tests for minitest's spec DSLMike Moore2012-09-241-0/+7
| |
* | 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-216-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 Dev2012-09-211-1/+1
| |
| * fix Hash#slice code example [ci skip]Francesco Rodriguez2012-09-181-1/+1
| |
| * update ActionMailer documentation [ci skip]Francesco Rodriguez2012-09-175-18/+15
| |
| * 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-162-10/+22
| | | | | | | | 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
| |