aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix the method name for recusionPratik Naik2010-01-011-1/+1
* Move predicate building to a stand alone PredicateBuilder classPratik Naik2010-01-013-30/+41
* Some railties cleanup:Carl Lerche2009-12-3119-109/+116
* Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rbCarl Lerche2009-12-3117-135/+140
* Use Arel::Attribute when building where conditions from hashPratik Naik2010-01-011-5/+36
* Raise a helpful error if config.frameworks is usedCarl Lerche2009-12-312-0/+23
* Add a /rails.rb for each framework for consistencyCarl Lerche2009-12-317-4/+18
* Fully remove config.frameworks in favor of requires in boot.rbCarl Lerche2009-12-318-38/+24
* Use Arel::Attribute for pk conditionsPratik Naik2010-01-011-4/+4
* Add Relation#table to get the relevant Arel::TablePratik Naik2010-01-011-1/+10
* Add Relation#delete [Pratik Naik, Emilio Tagua]Pratik Naik2010-01-013-4/+8
* Dont gitkeep things that are gitignoredDavid Heinemeier Hansson2009-12-311-1/+1
* 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
| * Fix up AR extension by using Railties module instead of Rails and requiring C...Jeremy Kemper2009-12-304-8/+10
| * Remove self-requireJeremy Kemper2009-12-301-2/+1
| * Partially revert "ActionDispatch should require as little of ActiveSupport as...Jeremy Kemper2009-12-301-0/+2
| * 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 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
| | |\