aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-09-30418-1541/+1788
|\
| * 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
| * ruby 1.9: Qualify toplevel File reference since config.ru could be eval'd in ...Joshua Peek2009-09-261-1/+1
| * Move Rails::Static into ActionDispatchJoshua Peek2009-09-269-66/+56
| * Enable static asset server by defaultJoshua Peek2009-09-267-7/+21
| * Add gem filter for default gem path since it maybe different than the set of ...Joshua Peek2009-09-262-3/+3
| * Move tmp directory creation from server to initializerJoshua Peek2009-09-262-4/+7
| * Remove config.ru generation from --with-dispatchers optionJoshua Peek2009-09-254-10/+5
| * Fix railties testsJoshua Peek2009-09-254-3/+10
| * Set const for application object. "Basecamp::Application"Joshua Peek2009-09-251-1/+3
| * Initializer.run returns an application objectJoshua Peek2009-09-253-2/+16
| * Extract "parse_config" into ADJoshua Peek2009-09-255-32/+31
| * Restore "Start Rails::Application objectJoshua Peek2009-09-255-0/+195
| * Remove relative url configuration from script/serverJoshua Peek2009-09-251-15/+4
| * Generate a config.ru stubJoshua Peek2009-09-253-13/+11
| * Revert "Start Rails::Application object"Joshua Peek2009-09-256-268/+38
| * Start Rails::Application objectYehuda Katz + Carl Lerche2009-09-256-38/+268
| * Fix generic url rewriter in integration testsJoshua Peek2009-09-252-1/+10
| * Wrap isolated test runner in a test suiteJoshua Peek2009-09-253-9/+24
| * Nah, test SHA1, but skip the test and whine if OpenSSL is borked upJeremy Kemper2009-09-241-4/+13
| * Test with MD5 digest in an attempt to mollify CIJeremy Kemper2009-09-241-1/+1
| * Use ActiveModel::TestCase base classJeremy Kemper2009-09-244-7/+7
| * Make gemspecs the authoritative source instead of generating them from the Ra...Joshua Peek2009-09-2512-418/+119
| * Use OpenSSL::Digest.const(...).new instead of OpenSSL::Digest::Digest.new(...)Jeremy Kemper2009-09-241-1/+1
| * Explicitly require String#bytesize extensionJeremy Kemper2009-09-241-0/+2