aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-09-2222-301/+652
|\
| * Fixes Sam Ruby tests suite.José Valim2009-09-214-56/+113
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Merge commit 'jose/orchestra'Yehuda Katz2009-09-2121-254/+548
| |\
| | * Instrumenting cache stores.José Valim2009-09-204-78/+84
| | |
| | * Instrument create and deliver in ActionMailer.José Valim2009-09-201-56/+64
| | |
| | * Use NewCallbacks on ActionDispatch::Callbacks.José Valim2009-09-205-35/+53
| | |
| | * Add Orchestra instrumentation to fragment and page caching.José Valim2009-09-207-69/+65
| | |
| | * Instrument process_action, render and sql.José Valim2009-09-203-19/+20
| | |
| | * Added Orchestra.José Valim2009-09-203-0/+265
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-09-2176-708/+498
|\| |
| * | fixed ActiveModel::Lint typos [#3236 state:resolved]lakshan2009-09-211-4/+3
| |/ | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * All tests should be ran under isolated_test tooJoshua Peek2009-09-191-5/+5
| |
| * Merge "test_new_base" runner into standard "test_action_pack"Joshua Peek2009-09-191-9/+2
| |
| * Ensure changes to I18n locale get reset during testsJoshua Peek2009-09-193-14/+14
| |
| * Follow short name convention for test folder and just call it "abstract"Joshua Peek2009-09-1915-1/+1
| |
| * Merge bundler helper into abstract_unitJoshua Peek2009-09-192-12/+8
| |
| * Namespace TestControllers inside their test case classJoshua Peek2009-09-194-199/+216
| |
| * Avoid conflict with a "MetalTest" module used in testsJoshua Peek2009-09-191-1/+1
| |
| * All on one base, don't need thisJoshua Peek2009-09-191-3/+0
| |
| * Avoid conflicts with another ContentTypeController used in testingJoshua Peek2009-09-195-8/+7
| |
| * All on one abstract_unitJoshua Peek2009-09-1922-143/+92
| |
| * There is only one base nowJoshua Peek2009-09-191-1/+0
| |
| * Make sure caching test is using a generatable urlJoshua Peek2009-09-191-2/+2
| |
| * 1.9 fix for changes to #to_s. By Sam Ruby. [#3228 state:resolved]Yehuda Katz2009-09-181-2/+2
| |
| * Fix typo.Brian Donovan2009-09-171-1/+1
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Extract class-finder method from instantiateJeremy Kemper2009-09-171-27/+19
| |
| * Collapse nested conditionalJeremy Kemper2009-09-171-15/+13
| |
| * making nokogiri to hash less clever, more fast O_oAaron Patterson2009-09-171-20/+12
| | | | | | | | | | | | [#2243 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix brittle content-type check. [#1956 state:committed]Jeremy Kemper2009-09-172-4/+4
| |
| * Enable use of MySQL stored procedures by default.Justin Bailey2009-09-173-1/+24
| | | | | | | | | | | | [#3204 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Allow Nokogiri XmlMini backend to process cdata elementsDeveloper2009-09-172-1/+12
| | | | | | | | | | | | [#3219 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Forward all methods to delayed logJoshua Peek2009-09-161-6/+8
| |
| * Adds patch to CIYehuda Katz2009-09-151-1/+1
| |
| * Remove unused code in ActionView.José Valim2009-09-154-133/+0
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Beef up AD::Rescue to replace global exception handling lost in ↵Joshua Peek2009-09-152-26/+29
| | | | | | | | ApplicationController
| * Remove global exception catching from ApplicationController.Joshua Peek2009-09-153-60/+19
| | | | | | It was severely broken since it was ported to NewBase and is causing problems with normal exception catching. A replacement is coming soon.
| * Require rubygems in generators test so Action Dispatch can find rackJeremy Kemper2009-09-141-1/+3
| |
| * Require active_support after autoload setupJeremy Kemper2009-09-142-9/+9
| |
| * Style bikeshed: prefer obvious string paths with / separator to args lists ↵Jeremy Kemper2009-09-141-6/+6
| | | | | | | | with ', ' separator
| * Fix deprecated gem-name requiresJeremy Kemper2009-09-142-2/+2
| |
| * Cherry-pick core extensions. Don't explicitly require rubygems. Use load ↵Jeremy Kemper2009-09-142-13/+12
| | | | | | | | path for vendored thor.
| * Remove premature active_support/miniJeremy Kemper2009-09-141-9/+0
| |
| * Uses extlib_inheritable_accessorJeremy Kemper2009-09-141-0/+2
| |
* | Updated ARel version.Emilio Tagua2009-09-141-5/+5
| |
* | Merge commit 'rails/master'Emilio Tagua2009-09-14250-673/+1223
|\|
| * Lookup ruby bin name tooJoshua Peek2009-09-141-1/+1
| |
| * Use rbconfig instead of rubygem detectionJoshua Peek2009-09-141-1/+2
| |
| * For testing, only load rubygems if mocha is missingJoshua Peek2009-09-141-1/+8
| |
| * Forgot to update load path dir for vendored memcacheJoshua Peek2009-09-142-2/+1
| |
| * Use abortJeremy Kemper2009-09-131-2/+1
| |