aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge commit 'josevalim/arlog'Jeremy Kemper2009-12-306-32/+77
| |\ \
| | * | Kick AR logging back to life and move ControllerRuntime inside ActiveRecord::...José Valim2009-12-306-32/+77
| * | | Merge branch 'master' of github.com:rails/railsJeremy Kemper2009-12-300-0/+0
| |\ \ \
| | * | | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally remo...José Valim2009-12-305-289/+9
| | * | | Setup and teardown now use new callbacks.José Valim2009-12-303-32/+52
| * | | | Merge commit 'josevalim/callbacks'Jeremy Kemper2009-12-308-321/+61
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally remo...José Valim2009-12-305-289/+9
| | * | | Setup and teardown now use new callbacks.José Valim2009-12-303-32/+52
| | |/ /
| * | | ActionDispatch should require as little of ActiveSupport as possibleCarl Lerche2009-12-301-3/+1
* | | | Added .gitkeep to empty directories and --skip-git to skip gitignore/gitkeep ...David Heinemeier Hansson2009-12-311-6/+13
* | | | Orphan experiment no longer neededDavid Heinemeier Hansson2009-12-301-69/+0
|/ / /
* / / Organize Relation methods into separate modulesPratik Naik2009-12-305-241/+262
|/ /
* | Merge commit 'mikel/master'Jeremy Kemper2009-12-303-0/+26
|\|
| * Adding TMailCompat layer for :set_content_type and friendsMikel Lindsaar2009-12-303-0/+26
* | Relation#many? shoud load the records if there's a LIMITPratik Naik2009-12-302-1/+7
* | Add Relation#any? and Relation#many?Pratik Naik2009-12-302-0/+42
* | Fix the count test for postgresPratik Naik2009-12-301-1/+1
|/
* Revert "Add default respond_to formats to ApplicationController."Jeremy Kemper2009-12-291-1/+0
* Use the correct method for eager loading autoloadsCarl Lerche2009-12-292-1/+17
* Clean up changelog a bitJeremy Kemper2009-12-291-22/+12
* Merge branch 'mail'Jeremy Kemper2009-12-2952-8306/+463
|\
| * Move mail gem dep to Action Mailer's gemspecJeremy Kemper2009-12-292-4/+1
| * Merge branch 'master' of git://github.com/mikel/rails into mailJeremy Kemper2009-12-29340-5815/+6374
| |\
| | * Adding default 8bit encoding if the body has non usascii in itMikel Lindsaar2009-12-282-1/+3
| | * Remove unused code paths and require mail only when it's needed.José Valim2009-12-283-17/+9
| | * Moved sort_parts into Mail, updated mail requirement to 1.4.2Mikel Lindsaar2009-12-285-40/+22
| | * DRY ActionMailer code.José Valim2009-12-271-60/+61
| | * Getting rid of some warnings in AM suite.José Valim2009-12-274-8/+10
| | * Merge Mail with latest Rails and move mail gem to Gemfile.José Valim2009-12-27175-3154/+3185
| | |\
| | * | Updating action_mailer to need mail 1.4.1Mikel Lindsaar2009-12-271-1/+1
| | * | Changing body to use :to_s instead of :decoded... better use caseMikel Lindsaar2009-12-277-39/+39
| | * | Updating readmeMikel Lindsaar2009-12-271-1/+4
| | * | Updating actionmailer to call :to_s on all field values instead of decodedMikel Lindsaar2009-12-272-9/+9
| | * | Updating requirement for mail to 1.3.4Mikel Lindsaar2009-12-171-1/+1
| | * | Updating requirement for mail to 1.3.3Mikel Lindsaar2009-12-171-1/+1
| | * | Merged in latest changes from rails/masterMikel Lindsaar2009-12-174-3/+24
| | * | Fixes for working with 1.9.1-headMikel Lindsaar2009-12-175-24/+10
| | * | Merge branch 'rails'Mikel Lindsaar2009-12-17217-2750/+3351
| | |\ \
| | * \ \ Merge branch 'master' of git://github.com/rails/rails into rails_masterMikel Lindsaar2009-11-24226-2695/+1914
| | |\ \ \
| * | \ \ \ Merge branch 'master' into mailJeremy Kemper2009-11-2315-102/+118
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'mikel/master' into mailJeremy Kemper2009-11-237-30/+37
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Change require mail version to 1.3.0Mikel Lindsaar2009-11-241-1/+1
| | * | | | | Changed deprecation to use ActiveSupport::DeprecationMikel Lindsaar2009-11-241-2/+3
| | * | | | | Fixed up incompatible encoding problem for Ruby 1.9 in test suiteMikel Lindsaar2009-11-232-3/+13
| | * | | | | Deprecating attachment :body => 'string' in favour of attachment :data => 'st...Mikel Lindsaar2009-11-232-6/+10
| | * | | | | Removing utils, and updating requires to matchMikel Lindsaar2009-11-234-20/+12
| * | | | | | Add mail dep to AM gemspecJeremy Kemper2009-11-232-3/+1
| * | | | | | Never require jcodeJeremy Kemper2009-11-221-1/+0
| * | | | | | Rely on gemspec and bundled env for gem dependency. We just require it.Jeremy Kemper2009-11-221-2/+1
| * | | | | | Bundle mail 1.2.8Jeremy Kemper2009-11-221-0/+3