aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-01-2054-810/+738
|\|
| * Use unscoped instead of with_exclusive_scope for preloadingPratik Naik2010-01-201-14/+13
| * Move array_of_strings? to RelationPratik Naik2010-01-202-6/+6
| * Remove stale methods constructing joinsPratik Naik2010-01-201-28/+0
| * Stop overriding LoadError.new to return a MissingSourceError (and sometimes n...Yehuda Katz2010-01-196-33/+36
| * Revert streaming params parser support.Joshua Peek2010-01-191-3/+3
| * Cleanup middleware introspection outputJoshua Peek2010-01-193-5/+3
| * Scope#find is no longer needed now that Relation#find handles all the casesPratik Naik2010-01-201-12/+0
| * Delegate all finders to RelationPratik Naik2010-01-204-159/+154
| * Ignore order for simple calculations to make postgresql happyPratik Naik2010-01-201-1/+2
| * Mail should log when raise_delivery_methods is false.José Valim2010-01-192-10/+12
| * Named scopes dont need count() now that Relation#count handles all the casesPratik Naik2010-01-201-5/+0
| * with_scope no longer needs :reverse_mergePratik Naik2010-01-201-13/+2
| * Remove find_with_associations and related code from associations now that Rel...Pratik Naik2010-01-202-82/+0
| * Fix bug that causes TimeZone.seconds_to_utc_offset to returns wrong offset wh...Prem Sichanugrist2010-01-192-3/+10
| * Avoid load tasks from plugins recursively (so stuff in tests or vendor does n...José Valim2010-01-191-1/+1
| * Allow railties to specify generators paths.José Valim2010-01-195-15/+67
| * Remove Relation#where_clausePratik Naik2010-01-193-11/+7
| * Give preference to to_a over arel from Relation#method_missingPratik Naik2010-01-193-5/+12
| * Rename CalculationMethods to Calculations and get rid of the old Calculations...Pratik Naik2010-01-195-14/+5
| * Move the only remaining calculation method calculate() to RelationPratik Naik2010-01-192-83/+62
| * Get rid of RAILS_ROOT deprecation on AM::TestCase.José Valim2010-01-191-1/+1
| * Logging thread should not die on logging errors.José Valim2010-01-192-1/+19
| * Get rid of construct_count_options_from_argsPratik Naik2010-01-192-33/+4
| * Delegate count to RelationPratik Naik2010-01-193-67/+68
| * Disable ShowExceptions during integration testsJoshua Peek2010-01-194-14/+16
| * Move parameters to the top on logging.José Valim2010-01-196-41/+52
| * Fix failing test.José Valim2010-01-191-2/+2
| * Do not send rack.input or any other rack information to AD listeners.José Valim2010-01-193-11/+17
| * Define named routes for other non-GET REST actionsJoshua Peek2010-01-191-4/+32
* | Fixing failing test on sendmail expectationMikel Lindsaar2010-01-201-1/+1
* | Updating gemspec to 2.0.1 for mailMikel Lindsaar2010-01-201-1/+1
* | Refactor delivery methods.José Valim2010-01-195-165/+113
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2010-01-193-44/+38
|\|
| * Fix the named scope equality checkPratik Naik2010-01-191-1/+1
| * Delegate :average, :minimum, :maximum, :sum to RelationPratik Naik2010-01-192-43/+37
* | Get all tests passing.José Valim2010-01-192-13/+32
* | First pass on fixing delivery methodMikel Lindsaar2010-01-191-8/+4
* | latest updatesMikel Lindsaar2010-01-192-12/+11
* | Merge branch 'master' of git://github.com/rails/rails into railsMikel Lindsaar2010-01-19357-3120/+6788
|\|
| * Fix DoubleRenderError error messagePratik Naik2010-01-191-1/+1
| * Add Relation#construct_relation_for_association_calculations for calculations...Pratik Naik2010-01-194-42/+17
| * Prettier hash dumpJoshua Peek2010-01-181-3/+7
| * Show Rack env dump on exception pageJoshua Peek2010-01-181-1/+4
| * Bring render_message back for 2.3 compatibility.José Valim2010-01-192-13/+33
| * Bring body(Hash) behavior back.José Valim2010-01-193-27/+32
| * `script/generate mailer Notifier` will now create a mailer at app/mailers.José Valim2010-01-195-8/+8
| * Get generators tests running on Ruby 1.9.1José Valim2010-01-1921-31/+53
| * Improve script/generate help.José Valim2010-01-191-1/+11
| * Since Rails will require Ruby >= 1.8.7, we can rely on instance_exec.José Valim2010-01-192-9/+12