Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into mail | Jeremy Kemper | 2009-11-22 | 211 | -2360/+1626 |
|\ | |||||
| * | Fix Rails::Rack::Static deprecated constant proxy | Jeremy Kemper | 2009-11-21 | 1 | -1/+1 |
| | | |||||
| * | Update gemspec also | Jeremy Kemper | 2009-11-19 | 2 | -2/+1 |
| | | |||||
| * | Should be rackmount 0.2 | Joshua Peek | 2009-11-19 | 1 | -1/+1 |
| | | |||||
| * | Depend on rack-mount 0.0.2 | Joshua Peek | 2009-11-19 | 1 | -1/+1 |
| | | |||||
| * | Extended and case insensitive regexp routes aren't that important. | Joshua Peek | 2009-11-19 | 1 | -15/+24 |
| | | | | | | | | Mark them as pending till I figure it out. | ||||
| * | Update routing for rackmount 0.2 api changes | Joshua Peek | 2009-11-19 | 1 | -54/+11 |
| | | |||||
| * | Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; ↵ | Jeremy Kemper | 2009-11-19 | 8 | -13/+13 |
| | | | | | | | | | | | | | | | | script/server working" Broke stuff. This reverts commit 520b8b59110dd130c89b317b6bd65d8644c7836f. | ||||
| * | Add basic nested named route support to new routing dsl. Also add a | Joshua Peek | 2009-11-19 | 2 | -8/+70 |
| | | | | | | | | bunch of pending tests. | ||||
| * | Fix test bleed | Jeremy Kemper | 2009-11-18 | 1 | -1/+1 |
| | | |||||
| * | Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working | Yehuda Katz + Carl Lerche | 2009-11-18 | 8 | -13/+13 |
| | | |||||
| * | Check whether another lib has implemented ruby 1.9 string interp syntax | Jeremy Kemper | 2009-11-18 | 1 | -1/+1 |
| | | |||||
| * | Extract form_authenticity_param instance method so it's overridable in ↵ | Jeremy Kemper | 2009-11-17 | 2 | -1/+24 |
| | | | | | | | | subclasses | ||||
| * | Insert generated association members in the same order they are specified ↵ | Gabe da Silveira | 2009-11-17 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | when assigning to a has_many :through using the generated *_ids method [#3491 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Revert "Ensure Model#destroy respects optimistic locking" | Jeremy Kemper | 2009-11-17 | 2 | -52/+0 |
| | | | | | | | | | | | | | | | | | | | | [#1966 state:open] This reverts commit 0d922885fb54c19f04680482f024452859218910. Conflicts: activerecord/lib/active_record/locking/optimistic.rb | ||||
| * | Merge remote branch 'Fingertips/master' | Joshua Peek | 2009-11-16 | 2 | -13/+66 |
| |\ | |||||
| | * | Allow explicit placement of hidden id element for nested models. | Will Read | 2009-11-15 | 2 | -13/+66 |
| | | | | | | | | | | | | | | | | | | [#3259 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | Make script/server work with correct application.rb | Yehuda Katz | 2009-11-16 | 2 | -1/+6 |
| | | | |||||
| * | | Require action_dispatch, not action_controller | Yehuda Katz | 2009-11-16 | 1 | -1/+1 |
| | | | |||||
| * | | Temporarily add submodules to the Rails repo for Arel and Rack::Mount. These ↵ | Yehuda Katz | 2009-11-16 | 3 | -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 also | Jeremy Kemper | 2009-11-15 | 1 | -1/+1 |
| | | |||||
| * | Add TimeZone dependency | Yehuda Katz | 2009-11-14 | 1 | -0/+2 |
| | | |||||
| * | Repair time dependencies | Jeremy Kemper | 2009-11-14 | 8 | -13/+9 |
| | | |||||
| * | Loosen optional gem deps from ~> to >= | Jeremy Kemper | 2009-11-14 | 1 | -1/+1 |
| | | |||||
| * | Remove Gemfile deps duplicated from AP gemspec | Jeremy Kemper | 2009-11-14 | 2 | -3/+1 |
| | | |||||
| * | Just use abstract_unit | Jeremy Kemper | 2009-11-14 | 1 | -12/+1 |
| | | |||||
| * | Fix bundler environment check | Jeremy Kemper | 2009-11-14 | 1 | -1/+1 |
| | | |||||
| * | No need for test stub | Jeremy Kemper | 2009-11-14 | 1 | -2/+2 |
| | | |||||
| * | No need to check for generated method, just redispatch | Jeremy Kemper | 2009-11-14 | 1 | -4/+3 |
| | | |||||
| * | Ruby 1.9.2: use recursive flatten | Jeremy Kemper | 2009-11-14 | 1 | -7/+1 |
| | | |||||
| * | Skip pg locking test due to connection checkout deadlock detection | Jeremy Kemper | 2009-11-14 | 1 | -5/+8 |
| | | |||||
| * | Consolidate date & time landscape: require 'active_support/time' | Jeremy Kemper | 2009-11-14 | 8 | -31/+23 |
| | | |||||
| * | Ruby 1.9.2: fix flatten_deeper to preserve nils | Jeremy Kemper | 2009-11-14 | 1 | -1/+1 |
| | | |||||
| * | Notifications: queue.drained? for testability in place of brittle sleeps | Jeremy Kemper | 2009-11-13 | 2 | -19/+21 |
| | | |||||
| * | Fix duration check for longer sleep | Jeremy Kemper | 2009-11-13 | 1 | -1/+1 |
| | | |||||
| * | CI: slow down brittle notifications tests | Jeremy Kemper | 2009-11-13 | 1 | -9/+10 |
| | | |||||
| * | Revert "Split arel_table into method to get a relation and another to ↵ | Jeremy Kemper | 2009-11-13 | 5 | -13/+13 |
| | | | | | | | | | | | | memoize the default relation." This reverts commit bd51790895fc75a3b4e19e8dd7aa6dc389d77068. | ||||
| * | Ruby 1.9.2: StringIO no longer has #path | Jeremy Kemper | 2009-11-13 | 1 | -1/+1 |
| | | |||||
| * | Ruby 1.9.2: fix broken to_ary expectation | Jeremy Kemper | 2009-11-13 | 1 | -1/+3 |
| | | |||||
| * | Ruby 1.9.2: disallow explicit coercion via method_missing. Only give ↵ | Jeremy Kemper | 2009-11-13 | 4 | -19/+35 |
| | | | | | | | | friendly nil errors for Array and Active Record methods. | ||||
| * | Rescue handlers should never need array wrapping. Bug if so. | Jeremy Kemper | 2009-11-13 | 1 | -2/+1 |
| | | |||||
| * | Split arel_table into method to get a relation and another to memoize the ↵ | Jeremy Kemper | 2009-11-13 | 5 | -13/+13 |
| | | | | | | | | default relation. | ||||
| * | Missing customers fixture | Jeremy Kemper | 2009-11-13 | 1 | -2/+2 |
| | | |||||
| * | Uses Hash#reverse_merge | Jeremy Kemper | 2009-11-13 | 1 | -0/+2 |
| | | |||||
| * | Ruby 1.9.2: avoid #flatten | Jeremy Kemper | 2009-11-13 | 3 | -18/+38 |
| | | |||||
| * | Prefer Array.wrap to Array() | Jeremy Kemper | 2009-11-13 | 1 | -1/+2 |
| | | |||||
| * | Ruby 1.9.2: work around Array allowing method_missing for to_ary | Jeremy Kemper | 2009-11-13 | 1 | -4/+3 |
| | | |||||
| * | Test that Array.wrap works with proxy objects and structs | Jeremy Kemper | 2009-11-13 | 1 | -0/+20 |
| | | |||||
| * | Split mime responder into smaller chunks and allow action to be configured. | José Valim | 2009-11-13 | 2 | -18/+48 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Remove rackmount const usage | Joshua Peek | 2009-11-12 | 2 | -3/+3 |
| | |