Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mikel/master' | Jeremy Kemper | 2009-12-30 | 3 | -0/+26 |
|\ | |||||
| * | Adding TMailCompat layer for :set_content_type and friends | Mikel Lindsaar | 2009-12-30 | 3 | -0/+26 |
| | | |||||
* | | Relation#many? shoud load the records if there's a LIMIT | Pratik Naik | 2009-12-30 | 2 | -1/+7 |
| | | |||||
* | | Add Relation#any? and Relation#many? | Pratik Naik | 2009-12-30 | 2 | -0/+42 |
| | | |||||
* | | Fix the count test for postgres | Pratik Naik | 2009-12-30 | 1 | -1/+1 |
|/ | |||||
* | Revert "Add default respond_to formats to ApplicationController." | Jeremy Kemper | 2009-12-29 | 1 | -1/+0 |
| | | | | | | (Needs consensus that these are appropriate defaults.) This reverts commit 66604b2e0e8d3aba25cab673c7a3d7831a68490c. | ||||
* | Use the correct method for eager loading autoloads | Carl Lerche | 2009-12-29 | 2 | -1/+17 |
| | |||||
* | Clean up changelog a bit | Jeremy Kemper | 2009-12-29 | 1 | -22/+12 |
| | |||||
* | Merge branch 'mail' | Jeremy Kemper | 2009-12-29 | 52 | -8306/+463 |
|\ | |||||
| * | Move mail gem dep to Action Mailer's gemspec | Jeremy Kemper | 2009-12-29 | 2 | -4/+1 |
| | | |||||
| * | Merge branch 'master' of git://github.com/mikel/rails into mail | Jeremy Kemper | 2009-12-29 | 340 | -5815/+6374 |
| |\ | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb | ||||
| | * | Adding default 8bit encoding if the body has non usascii in it | Mikel Lindsaar | 2009-12-28 | 2 | -1/+3 |
| | | | |||||
| | * | Remove unused code paths and require mail only when it's needed. | José Valim | 2009-12-28 | 3 | -17/+9 |
| | | | |||||
| | * | Moved sort_parts into Mail, updated mail requirement to 1.4.2 | Mikel Lindsaar | 2009-12-28 | 5 | -40/+22 |
| | | | |||||
| | * | DRY ActionMailer code. | José Valim | 2009-12-27 | 1 | -60/+61 |
| | | | |||||
| | * | Getting rid of some warnings in AM suite. | José Valim | 2009-12-27 | 4 | -8/+10 |
| | | | |||||
| | * | Merge Mail with latest Rails and move mail gem to Gemfile. | José Valim | 2009-12-27 | 175 | -3154/+3185 |
| | |\ | |||||
| | * | | Updating action_mailer to need mail 1.4.1 | Mikel Lindsaar | 2009-12-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Changing body to use :to_s instead of :decoded... better use case | Mikel Lindsaar | 2009-12-27 | 7 | -39/+39 |
| | | | | |||||
| | * | | Updating readme | Mikel Lindsaar | 2009-12-27 | 1 | -1/+4 |
| | | | | |||||
| | * | | Updating actionmailer to call :to_s on all field values instead of decoded | Mikel Lindsaar | 2009-12-27 | 2 | -9/+9 |
| | | | | |||||
| | * | | Updating requirement for mail to 1.3.4 | Mikel Lindsaar | 2009-12-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Updating requirement for mail to 1.3.3 | Mikel Lindsaar | 2009-12-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merged in latest changes from rails/master | Mikel Lindsaar | 2009-12-17 | 4 | -3/+24 |
| | | | | |||||
| | * | | Fixes for working with 1.9.1-head | Mikel Lindsaar | 2009-12-17 | 5 | -24/+10 |
| | | | | |||||
| | * | | Merge branch 'rails' | Mikel Lindsaar | 2009-12-17 | 217 | -2750/+3351 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb actionmailer/lib/action_mailer/delivery_method/smtp.rb | ||||
| | * \ \ | Merge branch 'master' of git://github.com/rails/rails into rails_master | Mikel Lindsaar | 2009-11-24 | 226 | -2695/+1914 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'master' into mail | Jeremy Kemper | 2009-11-23 | 15 | -102/+118 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge commit 'mikel/master' into mail | Jeremy Kemper | 2009-11-23 | 7 | -30/+37 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb | ||||
| | * | | | | | Change require mail version to 1.3.0 | Mikel Lindsaar | 2009-11-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Changed deprecation to use ActiveSupport::Deprecation | Mikel Lindsaar | 2009-11-24 | 1 | -2/+3 |
| | | | | | | | |||||
| | * | | | | | Fixed up incompatible encoding problem for Ruby 1.9 in test suite | Mikel Lindsaar | 2009-11-23 | 2 | -3/+13 |
| | | | | | | | |||||
| | * | | | | | Deprecating attachment :body => 'string' in favour of attachment :data => ↵ | Mikel Lindsaar | 2009-11-23 | 2 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'string' | ||||
| | * | | | | | Removing utils, and updating requires to match | Mikel Lindsaar | 2009-11-23 | 4 | -20/+12 |
| | | | | | | | |||||
| * | | | | | | Add mail dep to AM gemspec | Jeremy Kemper | 2009-11-23 | 2 | -3/+1 |
| | | | | | | | |||||
| * | | | | | | Never require jcode | Jeremy Kemper | 2009-11-22 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Rely on gemspec and bundled env for gem dependency. We just require it. | Jeremy Kemper | 2009-11-22 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Bundle mail 1.2.8 | Jeremy Kemper | 2009-11-22 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Merge commit 'origin/master' into mail | Jeremy Kemper | 2009-11-22 | 211 | -2360/+1626 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Opps.. need to require it as well as gem mail :) | Mikel Lindsaar | 2009-11-22 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Adding mail as a gem load | Mikel Lindsaar | 2009-11-22 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | 131 tests, 309 assertions, 0 failures, 0 errors | Mikel Lindsaar | 2009-11-22 | 8 | -65/+57 |
| | | | | | | | |||||
| * | | | | | | Updating tests for Mail gem | Mikel Lindsaar | 2009-11-22 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | 131 tests, 266 assertions, 9 failures, 6 errors | Mikel Lindsaar | 2009-11-21 | 3 | -13/+36 |
| | | | | | | | |||||
| * | | | | | | Down to 13 failures, 14 errors | Mikel Lindsaar | 2009-11-20 | 2 | -7/+14 |
| | | | | | | | |||||
| * | | | | | | Down to 30 failures total | Mikel Lindsaar | 2009-11-20 | 5 | -51/+97 |
| | | | | | | | |||||
| * | | | | | | More updates... 45 errors left to get it working with Mail gem | Mikel Lindsaar | 2009-11-20 | 9 | -72/+94 |
| | | | | | | | |||||
| * | | | | | | Starting again on actionmailer integration with mail | Mikel Lindsaar | 2009-11-12 | 44 | -8119/+186 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:rails/rails | Jeremy Kemper | 2009-12-29 | 2 | -12/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make plugins responsible for loading their own rake tasks | Sam Pohlenz | 2009-12-29 | 2 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> |