| Commit message (Expand) | Author | Age | Files | Lines |
* | Partially revert "ActionDispatch should require as little of ActiveSupport as... | Jeremy Kemper | 2009-12-30 | 1 | -0/+2 |
* | depends on Module#attr_internal | Jeremy Kemper | 2009-12-30 | 1 | -1/+3 |
* | Merge commit 'josevalim/arlog' | Jeremy Kemper | 2009-12-30 | 6 | -32/+77 |
|\ |
|
| * | Kick AR logging back to life and move ControllerRuntime inside ActiveRecord::... | José Valim | 2009-12-30 | 6 | -32/+77 |
* | | Merge branch 'master' of github.com:rails/rails | Jeremy Kemper | 2009-12-30 | 0 | -0/+0 |
|\ \ |
|
| * | | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally remo... | José Valim | 2009-12-30 | 5 | -289/+9 |
| * | | Setup and teardown now use new callbacks. | José Valim | 2009-12-30 | 3 | -32/+52 |
* | | | Merge commit 'josevalim/callbacks' | Jeremy Kemper | 2009-12-30 | 8 | -321/+61 |
|\ \ \
| |/ /
|/| | |
|
| * | | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally remo... | José Valim | 2009-12-30 | 5 | -289/+9 |
| * | | Setup and teardown now use new callbacks. | José Valim | 2009-12-30 | 3 | -32/+52 |
| |/ |
|
* | | ActionDispatch should require as little of ActiveSupport as possible | Carl Lerche | 2009-12-30 | 1 | -3/+1 |
* | | Organize Relation methods into separate modules | Pratik Naik | 2009-12-30 | 5 | -241/+262 |
|/ |
|
* | 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 |
* | 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 |
| |\ |
|
| | * | 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 |
| | |\ \ |
|
| | * \ \ | 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 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | 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 => 'st... | Mikel Lindsaar | 2009-11-23 | 2 | -6/+10 |
| | * | | | | | 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 |