aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clarify assertionJeremy Kemper2009-12-301-2/+2
|
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-3124-559/+341
|\
| * Fix controller runtime testJeremy Kemper2009-12-301-2/+2
| |
| * Allow ActiveSupport's isolation tests to run with MiniTest on 1.9Carl Lerche2009-12-302-141/+189
| |
| * Revert "Add config.action_controller.include behavior to plugins."Jeremy Kemper2009-12-305-57/+3
| | | | | | | | | | | | | | | | This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e. Conflicts: railties/lib/rails/plugin.rb
| * Fix up AR extension by using Railties module instead of Rails and requiring ↵Jeremy Kemper2009-12-304-8/+10
| | | | | | | | ControllerRuntime at initialization time instead of boot
| * Remove self-requireJeremy Kemper2009-12-301-2/+1
| |
| * Partially revert "ActionDispatch should require as little of ActiveSupport ↵Jeremy Kemper2009-12-301-0/+2
| | | | | | | | | | | | as possible" Removes load path change from commit bb153f42e45160c5ef3593c393db5d3c6857fb70.
| * depends on Module#attr_internalJeremy Kemper2009-12-301-1/+3
| |
| * Merge commit 'josevalim/arlog'Jeremy Kemper2009-12-306-32/+77
| |\
| | * Kick AR logging back to life and move ControllerRuntime inside ↵José Valim2009-12-306-32/+77
| | | | | | | | | | | | ActiveRecord::Rails.
| * | Merge branch 'master' of github.com:rails/railsJeremy Kemper2009-12-300-0/+0
| |\ \
| | * | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally ↵José Valim2009-12-305-289/+9
| | | | | | | | | | | | | | | | remove it.
| | * | 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 ↵José Valim2009-12-305-289/+9
| | | | | | | | | | | | | | | | remove it.
| | * | 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
| | | | | | | | | | | | files
* | | 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
| | | | | | (Needs consensus that these are appropriate defaults.) This reverts commit 66604b2e0e8d3aba25cab673c7a3d7831a68490c.
* 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
| |\ | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb
| | * 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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_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
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 02:15:18 +0000