aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2009-11-17659-12426/+11342
|\ | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb
| * Merge remote branch 'Fingertips/master'Joshua Peek2009-11-162-13/+66
| |\
| | * Allow explicit placement of hidden id element for nested models.Will Read2009-11-152-13/+66
| | | | | | | | | | | | | | | | | | [#3259 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * | Make script/server work with correct application.rbYehuda Katz2009-11-162-1/+6
| | |
| * | Require action_dispatch, not action_controllerYehuda Katz2009-11-161-1/+1
| | |
| * | Temporarily add submodules to the Rails repo for Arel and Rack::Mount. These ↵Yehuda Katz2009-11-163-0/+12
| |/ | | | | | | submodules will be removed once we add proper Gemfile following to bundler
| * Ruby 1.9: skip pg locking test for 1.9.1 alsoJeremy Kemper2009-11-151-1/+1
| |
| * Add TimeZone dependencyYehuda Katz2009-11-141-0/+2
| |
| * Repair time dependenciesJeremy Kemper2009-11-148-13/+9
| |
| * Loosen optional gem deps from ~> to >=Jeremy Kemper2009-11-141-1/+1
| |
| * Remove Gemfile deps duplicated from AP gemspecJeremy Kemper2009-11-142-3/+1
| |
| * Just use abstract_unitJeremy Kemper2009-11-141-12/+1
| |
| * Fix bundler environment checkJeremy Kemper2009-11-141-1/+1
| |
| * No need for test stubJeremy Kemper2009-11-141-2/+2
| |
| * No need to check for generated method, just redispatchJeremy Kemper2009-11-141-4/+3
| |
| * Ruby 1.9.2: use recursive flattenJeremy Kemper2009-11-141-7/+1
| |
| * Skip pg locking test due to connection checkout deadlock detectionJeremy Kemper2009-11-141-5/+8
| |
| * Consolidate date & time landscape: require 'active_support/time'Jeremy Kemper2009-11-148-31/+23
| |
| * Ruby 1.9.2: fix flatten_deeper to preserve nilsJeremy Kemper2009-11-141-1/+1
| |
| * Notifications: queue.drained? for testability in place of brittle sleepsJeremy Kemper2009-11-132-19/+21
| |
| * Fix duration check for longer sleepJeremy Kemper2009-11-131-1/+1
| |
| * CI: slow down brittle notifications testsJeremy Kemper2009-11-131-9/+10
| |
| * Revert "Split arel_table into method to get a relation and another to ↵Jeremy Kemper2009-11-135-13/+13
| | | | | | | | | | | | memoize the default relation." This reverts commit bd51790895fc75a3b4e19e8dd7aa6dc389d77068.
| * Ruby 1.9.2: StringIO no longer has #pathJeremy Kemper2009-11-131-1/+1
| |
| * Ruby 1.9.2: fix broken to_ary expectationJeremy Kemper2009-11-131-1/+3
| |
| * Ruby 1.9.2: disallow explicit coercion via method_missing. Only give ↵Jeremy Kemper2009-11-134-19/+35
| | | | | | | | friendly nil errors for Array and Active Record methods.
| * Rescue handlers should never need array wrapping. Bug if so.Jeremy Kemper2009-11-131-2/+1
| |
| * Split arel_table into method to get a relation and another to memoize the ↵Jeremy Kemper2009-11-135-13/+13
| | | | | | | | default relation.
| * Missing customers fixtureJeremy Kemper2009-11-131-2/+2
| |
| * Uses Hash#reverse_mergeJeremy Kemper2009-11-131-0/+2
| |
| * Ruby 1.9.2: avoid #flattenJeremy Kemper2009-11-133-18/+38
| |
| * Prefer Array.wrap to Array()Jeremy Kemper2009-11-131-1/+2
| |
| * Ruby 1.9.2: work around Array allowing method_missing for to_aryJeremy Kemper2009-11-131-4/+3
| |
| * Test that Array.wrap works with proxy objects and structsJeremy Kemper2009-11-131-0/+20
| |
| * Split mime responder into smaller chunks and allow action to be configured.José Valim2009-11-132-18/+48
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove rackmount const usageJoshua Peek2009-11-122-3/+3
| |
| * Always bundle pg and mysql for AR testsJeremy Kemper2009-11-121-2/+2
| |
| * Rdoc for changes introduced in e2ed1a1ca, 36058f450.David Vrensk2009-11-122-0/+6
| | | | | | | | | | | | [#3451 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Refactor pluginsYehuda Katz + Carl Lerche2009-11-1119-1144/+321
| |
| * Update AR logger subscriber for Notifications subscriber args changeJeremy Kemper2009-11-111-2/+2
| |
| * test-unit 2: filter_backtrace is privateJeremy Kemper2009-11-101-2/+2
| |
| * CI: yeah, run those testsJeremy Kemper2009-11-101-6/+6
| |
| * CI: short-circuit at first failing task. Chmod 755 bin, vendor, vendor/gemsJeremy Kemper2009-11-101-4/+3
| |
| * Rack: HTTPS is either 'on' or 'off' as of ↵Jeremy Kemper2009-11-101-1/+1
| | | | | | | | 9b7a0569e4067d0c23a00fc24273436e85c56d7f
| * CI: list bundled gems in build environmentJeremy Kemper2009-11-101-0/+2
| |
| * Unify test:isolated across components and run by default at toplevelJeremy Kemper2009-11-106-33/+42
| |
| * CI: missed mysql gem in bundleJeremy Kemper2009-11-101-0/+1
| |
| * Back to rack master, rack-1.0 reverts the kind_of? String fixJeremy Kemper2009-11-101-1/+1
| |
| * Revert "Revert "Eliminate warning with layout is unset""Jeremy Kemper2009-11-101-1/+1
| | | | | | | | This reverts commit d8fd0499bfd6edc676ff3fbffc327656f6d5c320.
| * test-unit 2 compat: assert_raise doesn't support regexp second arg to match ↵Jeremy Kemper2009-11-102-2/+2
| | | | | | | | exception message