aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'associations_2'Emilio Tagua2009-10-056-13/+90
|\
| * Added eager loading support to Relation and ActiveRecord#all.Emilio Tagua2009-10-054-21/+34
| * Moved relation's test to relation_test.Emilio Tagua2009-10-054-9/+19
| * Added association preload to relation.Emilio Tagua2009-09-013-4/+58
* | Merge commit 'rails/master'Emilio Tagua2009-10-0550-395/+396
|\ \
| * | Revert "Fix Dispatch.new so passenger works" as it broke the buildMichael Koziarski2009-10-051-1/+1
| * | Fix Dispatch.new so passenger worksJoshua Peek2009-10-041-1/+1
| * | Only draw default route onceJoshua Peek2009-10-031-22/+37
| * | Use with_routing helper in tests instead of modifying global route setJoshua Peek2009-10-034-101/+125
| * | Redraw default routes on all internal integration tests. We don't need Simple...Joshua Peek2009-10-0315-41/+34
| * | Avoid creating new controller constants during test runtime. All routable con...Joshua Peek2009-10-032-68/+21
| * | Run AP isolated tests on CIJoshua Peek2009-10-031-0/+1
| * | Moved shared form helper models into fake_modelsJoshua Peek2009-10-033-99/+98
| * | NumberHelper depends on big decimal extensionsJoshua Peek2009-10-031-0/+1
| * | Changing directories during the test breaks file loading when ran by itselfJoshua Peek2009-10-032-32/+22
| * | Don't load rubygems for isolated testsJoshua Peek2009-10-031-2/+3
| * | Move improved isolated test runner to APJoshua Peek2009-10-032-6/+21
| * | File extra test folders into controller, dispatch, or templateJoshua Peek2009-10-0326-18/+17
| * | Add custom "with_routing" to internal tests to fix reseting session after usingJoshua Peek2009-10-0314-20/+30
* | | Merge commit 'rails/master'Emilio Tagua2009-10-033-25/+125
|\| |
| * | Cleanup whitespace introduced in 8377646 and f4f6888Joshua Peek2009-10-023-55/+47
| * | add indifferent access to the attributesTaryn East2009-10-023-1/+30
| * | update_attribute(s) added to Active ResourceTaryn East2009-10-022-2/+81
* | | Merge commit 'rails/master'Emilio Tagua2009-10-02414-1485/+1675
|\| |
| * | Initialize a new instance of Rails.application during integration testsCarl Lerche2009-09-301-1/+1
| * | Remove all calls to Rails::Initializer from boot.rbCarl Lerche2009-09-306-49/+70
| * | Remove a duplicate initializerCarl Lerche2009-09-291-12/+0
| * | Change Rails::Application to a class that is inherited from.Carl Lerche2009-09-295-30/+25
| * | Remove unneeded files from the railties test directoryCarl Lerche2009-09-2914-56/+0
| * | Fix the broken railties isolation testsCarl Lerche2009-09-298-121/+86
| * | Create the application object from config/environment.rbYehuda Katz + Carl Lerche2009-09-286-59/+46
| * | Ported the new ActionView::TestCase from 2-3-stable to master [#3260Erik Ostrom2009-09-288-38/+278
| * | Remove SQLite2 from CI setupMike Gunderloy2009-09-282-4/+2
| * | Make has_one with :conditions hash scope build or creation of the associated ...Luciano G Panaro2009-09-285-3/+34
| * | Escaping symbol passed into Memoizable's flush_cache for query methods to all...Jay Pignata2009-09-282-3/+12
| * | Allow PKG_NAME env variable to control the directory name used when 'rake dev...John Trupiano2009-09-281-1/+1
| * | Prefer tap to returningMatias Flores2009-09-281-1/+1
| * | Introduce :almost keyword for distance_of_time_in_words. Make 1.75 days - 2 d...John Trupiano2009-09-284-31/+59
| * | Enhancing distance_of_time_in_words to prefix year output with over and about...Jay Pignata2009-09-282-11/+15
| * | Move middleware and route configuration from AC::Dispatcher to Rails applicat...Joshua Peek2009-09-269-22/+30
| * | Allow setting a default application for all integration testsJoshua Peek2009-09-263-9/+28
| * | Create separate middleware stack for initializerJoshua Peek2009-09-263-5/+3
| * | Allow integration test rack app to be set with "@app" ivar instead of using o...Joshua Peek2009-09-269-28/+24
| * | Fix skipping memcache tests if a memcache server isn't runningJoshua Peek2009-09-261-0/+4
| * | Remove deprecated calls to Dispatcher.to_prepareJoshua Peek2009-09-262-13/+8
| * | Move default middleware stack into initializerJoshua Peek2009-09-268-40/+22
| * | AC::Dispatcher is the default app, don't need to set itJoshua Peek2009-09-261-4/+0
| * | Clean up session integration tests so they don't reference AC::DispatcherJoshua Peek2009-09-263-52/+15
| * | Pull middleware for Rails info from the initializer instead of ActionControllerJoshua Peek2009-09-263-7/+7
| * | include nokogiri gem, so activesupport nokogiri tests runChad Woolley2009-09-261-0/+2