Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2009-11-17 | 19 | -461/+494 |
|\ | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb | ||||
| * | Unify test:isolated across components and run by default at toplevel | Jeremy Kemper | 2009-11-10 | 1 | -5/+7 |
| | | |||||
| * | Be sure to invoke the super chain! And initialize response body. | Jeremy Kemper | 2009-11-10 | 1 | -0/+2 |
| | | |||||
| * | Enable warnings for mailer tests | Joshua Peek | 2009-11-09 | 1 | -1/+1 |
| | | |||||
| * | Avoid adding component lib/ to load path multiple times | Joshua Peek | 2009-11-09 | 1 | -1/+3 |
| | | |||||
| * | Change mailer subjects lookup. | José Valim | 2009-11-09 | 2 | -3/+3 |
| | | |||||
| * | Shush | Jeremy Kemper | 2009-11-05 | 1 | -0/+2 |
| | | |||||
| * | Extracted localized_cache.rb from ActionController, added it to ↵ | José Valim | 2009-11-01 | 1 | -0/+1 |
| | | | | | | | | AbstractController and made ActionMailer use it. | ||||
| * | Use I18n on ActionMailer subjects by default. | José Valim | 2009-11-01 | 2 | -3/+22 |
| | | |||||
| * | More refactoring on ActionMailer::Base. | José Valim | 2009-11-01 | 1 | -20/+23 |
| | | |||||
| * | Make tests run without deprecation warning (just one left). | José Valim | 2009-11-01 | 6 | -79/+110 |
| | | |||||
| * | Another refactoring on AM. body is deprecated, use render instead. | José Valim | 2009-11-01 | 4 | -115/+90 |
| | | |||||
| * | Add some basic render_test to AbstractController. | José Valim | 2009-11-01 | 1 | -5/+0 |
| | | |||||
| * | Move all render and layout pieces required in ActionMailer from ↵ | José Valim | 2009-11-01 | 2 | -99/+84 |
| | | | | | | | | ActionController to AbstractController. | ||||
| * | Remove ActionMailer helpers and rely on AbstractController one. | José Valim | 2009-11-01 | 4 | -134/+21 |
| | | |||||
| * | Refactor ActionMailer layout and remove legacy one. | José Valim | 2009-11-01 | 6 | -36/+31 |
| | | |||||
| * | abstract all of the ActionMailer delivery methods into their own classes. ↵ | Matthew Rudy Jacobs | 2009-11-01 | 11 | -68/+193 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thereby the following are equivalent ActionMailer::Base.delivery_method = :smtp ActionMailer::Base.delivery_method = ActionMailer::DeliveryMethod::Smtp we could equally set our own custom object as long as it provides the instance method :perform_delivery(mail) eg. class MySmsDeliveryMethod def perform_delivery(mail) Sms.send(mail['to'], mail['body']) end end MySmsMailer.delivery_method = MySmsDeliveryMethod.new Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Have all the tests running off a single Gemfile | Yehuda Katz + Carl Lerche | 2009-10-20 | 2 | -17/+7 |
| | | |||||
| * | Add rackmount to actionmailer gemspec | Joshua Peek | 2009-10-20 | 1 | -0/+1 |
| | | |||||
| * | Missed Gemfile commits | Jeremy Kemper | 2009-10-19 | 1 | -0/+9 |
| | | |||||
| * | Need to use "use_controllers" for nonexistent controller in AM test | Joshua Peek | 2009-10-18 | 1 | -21/+23 |
| | | |||||
| * | We won't be publishing tars and zips anymore | Joshua Peek | 2009-10-16 | 1 | -4/+2 |
| | | |||||
| * | Merge branch 'master' into orchestra | Jeremy Kemper | 2009-10-15 | 1 | -1/+1 |
| |\ | |||||
| | * | Change config implementation in AV slightly | Yehuda Katz | 2009-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Renamed Orchestra to Notifications once again [#3321 state:resolved] | José Valim | 2009-10-15 | 1 | -2/+2 |
| | | | |||||
| * | | Revert "Rename Orchestra to Notifications [#3321 state:resolved]" | José Valim | 2009-10-15 | 1 | -10/+10 |
| |/ | | | | | | | This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2. | ||||
| * | Fix AM tests by configuring AV | Jeremy Kemper | 2009-10-15 | 1 | -0/+2 |
| | | |||||
| * | Don't push siblings on load path if using bundled env | Jeremy Kemper | 2009-10-14 | 1 | -2/+8 |
| | | |||||
| * | AV expects options[:locals] to be a Hash | Jeremy Kemper | 2009-10-14 | 1 | -0/+1 |
| | | |||||
| * | Rename Orchestra to Notifications [#3321 state:resolved] | Joshua Peek | 2009-10-14 | 1 | -10/+10 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-10-10 | 1 | -1/+1 |
|\| | |||||
| * | Mark html safety | Jeremy Kemper | 2009-10-09 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-09-30 | 3 | -60/+17 |
|\| | |||||
| * | Prefer tap to returning | Matias Flores | 2009-09-28 | 1 | -1/+1 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3280 state:committed] | ||||
| * | Make gemspecs the authoritative source instead of generating them from the ↵ | Joshua Peek | 2009-09-25 | 2 | -59/+16 |
| | | | | | | | | Rakefile | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-09-21 | 4 | -57/+102 |
|\| | |||||
| * | Instrument create and deliver in ActionMailer. | José Valim | 2009-09-20 | 1 | -56/+64 |
| | | |||||
| * | Revert "Allow frameworks to be required by their gem name" | Jeremy Kemper | 2009-09-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | This has just been confusing. Better to educate than band-aid. This reverts commit 18a24274ec823ded4ffa29bf33fd3d76816aab7e. Originally from http://dev.rubyonrails.org/ticket/8845 [drnic] | ||||
| * | Refactor ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -1/+1 |
| | | |||||
| * | Add required dependencies on activemodel | Carl Lerche | 2009-09-01 | 1 | -1/+1 |
| | | |||||
| * | Add rake gemspec and gemspecs to the repo | Yehuda Katz | 2009-08-31 | 2 | -0/+38 |
| | | |||||
* | | Typo. wil should be will | Johan Andersson | 2009-08-19 | 1 | -1/+1 |
|/ | |||||
* | Get rid of parenthesize argument warnings | Pratik Naik | 2009-08-09 | 1 | -5/+5 |
| | |||||
* | Adds a :file delivery_method to save email to a file on disk | Eric Davis | 2009-08-08 | 3 | -1/+55 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2438 state:committed] | ||||
* | Default sent_on time to now in ActionMailer | Matt Duncan | 2009-08-08 | 2 | -2/+4 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2607 state:committed] | ||||
* | Rename find_by_parts and find_by_parts? to find and exists? | Yehuda Katz | 2009-08-07 | 1 | -2/+2 |
| | |||||
* | Replace _render_template_with_layout with _render_template since the layout ↵ | Yehuda Katz | 2009-08-07 | 2 | -6/+8 |
| | | | | is optional | ||||
* | Merge docrails | Pratik Naik | 2009-07-25 | 1 | -1/+1 |
| | |||||
* | Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 ↵ | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -3/+0 |
| | | | | state:resolved] | ||||
* | Bump up the version to 3.0.pre | Carl Lerche | 2009-06-30 | 2 | -4/+4 |
| |