aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16974 from silp-com/mail_was_calledYves Senn2014-09-225-2/+30
|\
| * Allow attaching files while the mail view is renderedChristian Felder (masone)2014-09-224-2/+24
|/
* [ci skip] ActionView and ActionMailer CHANGELOG docs fixesAkshay Vishnoi2014-09-181-4/+4
* Default to sorting user's test cases for nowGodfrey Chan2014-09-081-1/+1
* Rename remaining :in / :at to :wait / :wait_untilCristian Bica2014-09-042-15/+14
* Active Job refactoringCristian Bica2014-09-032-21/+16
* Leave all our tests as order_dependent! for nowMatthew Draper2014-09-021-0/+5
* [ci skip] Fix a typo in the doc of MessageDeliveryyuuji.yaginuma2014-09-021-3/+3
* [ActionMailer] Rename test/test_test to test/test_case_testAbdelkader Boudih2014-08-301-0/+0
* Refer to the library name instead of the constantRobin Dupret2014-08-301-1/+1
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-2918-105/+195
|\
| * Make test:isolated run without bundler for Action MailerRobin Dupret2014-08-291-3/+2
| * Merge pull request #16598 from seuros/masterMatthew Draper2014-08-231-0/+1
| |\
| | * [ActionMailer] require activejob railtieAbdelkader Boudih2014-08-221-0/+1
| * | applies API guidelines to new AM docsXavier Noria2014-08-212-32/+32
| * | Fix SyntaxErrorAkira Matsuda2014-08-211-1/+1
| |/
| * Make the explicit the Active Job dependency of Action MailerRafael Mendonça França2014-08-201-0/+1
| * [Rdoc] Make clear that we are sending an AR object [ci skip]Abdelkader Boudih2014-08-202-16/+16
| * Fix typo in rdoc [ci skip]Abdelkader Boudih2014-08-202-16/+16
| * Updated rdoc / guides / release notes related to ActiveJob / ActionMailerCristian Bica2014-08-206-41/+101
| * Deprecated .deliver / .deliver! to .deliver_now / .deliver_now!Cristian Bica2014-08-209-53/+92
| * Clear deliveries in order not to affect other testsAkira Matsuda2014-08-201-2/+4
| * Remove global helpers from the ActionMailer test suite.Lucas Mazza2014-08-192-13/+1
* | Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-191-1/+1
|/
* Extra spaceDavid Heinemeier Hansson2014-08-191-1/+0
* Add `set_delivery_method` and `restore_delivery_method` to `ActionMailer::Tes...Lucas Mazza2014-08-191-0/+9
* Fix the rails-dom-testing dependecyRafael Mendonça França2014-08-191-1/+1
* Merge branch 'master' into loofahRafael Mendonça França2014-08-1710-10/+172
|\
| * Add CHANGELOG entry for #deliver_laterDavid Heinemeier Hansson2014-08-171-0/+7
| * [ActiveJob] Use globalid gemAbdelkader Boudih2014-08-171-1/+0
| * [ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ActionMailer::Deliv...Abdelkader Boudih2014-08-174-8/+10
| * [ActiveJob] Fix test syntaxAbdelkader Boudih2014-08-171-10/+10
| * Fixed indentationCristian Bica2014-08-161-1/+1
| * Removed method missing from ActionMailer::MessageDeliveryCristian Bica2014-08-152-4/+4
| * Refactor DeliverLater into MessageDeliveryAbdelkader Boudih2014-08-149-83/+73
| * Make ActionMailer::Previews methods class methods.Abdelkader Boudih2014-08-142-0/+8
| * Merge branch 'master' into activejobCristian Bica2014-08-131-1/+3
| |\
| | * use :test delivery method for `base_test.rb`Yves Senn2014-08-132-6/+3
| | * actionmailer_tests_are_order_dependent!Akira Matsuda2014-08-131-0/+5
| | * AM, AP, AV, and AMo tests are already order_independent!Akira Matsuda2014-08-131-5/+0
| * | Added ActionMailer::DeliverLaterAbdelkader Boudih2014-08-137-1/+160
* | | Merge branch 'master' into loofahRafael Mendonça França2014-08-126-14/+95
|\ \ \ | | |/ | |/|
| * | Nobody sucks so nobody should call this awful method nameRafael Mendonça França2014-08-121-1/+1
| * | users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!Akira Matsuda2014-08-121-0/+5
| |/
| * Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-303-1/+12
| * Raise an exception when attachments are added after `mail` was called.Yves Senn2014-07-293-1/+62
| * Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
| |\
| | * Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
| * | Prefer to pass block when logging.Guo Xiang Tan2014-07-181-11/+13
| * | Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]Santosh Wadghule2014-07-141-1/+1
| |/