github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,587 Commits 34 Branches 105 Tags
4b325fcd1af4eeb44dae5a741d85ea09d3845e4e
Commit Graph

11587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Peek
4b325fcd1a Update routing for rackmount 0.2 api changes 2009-11-19 17:58:57 -08:00
Jeremy Kemper
c7c39f52dc Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working" 
Broke stuff.

This reverts commit 520b8b5911.
 2009-11-19 15:24:00 -08:00
Joshua Peek
5df26dd7a9 Add basic nested named route support to new routing dsl. Also add a 
bunch of pending tests.
 2009-11-19 09:04:53 -08:00
Jeremy Kemper
0dfd993e77 Fix test bleed 2009-11-18 17:54:27 -08:00
Yehuda Katz + Carl Lerche
520b8b5911 Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working 2009-11-18 16:28:37 -08:00
Jeremy Kemper
4403dfac6c Check whether another lib has implemented ruby 1.9 string interp syntax 2009-11-18 11:33:41 -08:00
Jeremy Kemper
e1385be025 Extract form_authenticity_param instance method so it's overridable in subclasses 2009-11-17 23:40:06 -08:00
Gabe da Silveira
ea290e77e6 Insert generated association members in the same order they are specified when assigning to a has_many :through using the generated *_ids method 
[#3491 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-11-17 22:25:40 -08:00
Jeremy Kemper
fb61fbd352 Revert "Ensure Model#destroy respects optimistic locking" 
[#1966 state:open]

This reverts commit 0d922885fb.

Conflicts:

	activerecord/lib/active_record/locking/optimistic.rb
 2009-11-17 15:35:35 -08:00
Joshua Peek
f8877d4b2a Merge remote branch 'Fingertips/master' 2009-11-16 21:03:27 -06:00
Yehuda Katz
c2997017f7 Make script/server work with correct application.rb 2009-11-16 13:58:08 -08:00
Yehuda Katz
2675ba9ef4 Require action_dispatch, not action_controller 2009-11-16 12:37:43 -08:00
Yehuda Katz
c1f5168073 Temporarily add submodules to the Rails repo for Arel and Rack::Mount. These submodules will be removed once we add proper Gemfile following to bundler 2009-11-16 12:30:06 -08:00
Will Read
7fadb3f261 Allow explicit placement of hidden id element for nested models. 
[#3259 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-11-15 21:47:57 +01:00
Jeremy Kemper
7601d482bd Ruby 1.9: skip pg locking test for 1.9.1 also 2009-11-15 10:28:58 -08:00
Yehuda Katz
cc011bc2be Add TimeZone dependency 2009-11-14 19:33:58 -08:00
Jeremy Kemper
bc1538e995 Repair time dependencies 2009-11-14 11:37:06 -08:00
Jeremy Kemper
74e1ff9dc2 Loosen optional gem deps from ~> to >= 2009-11-14 03:32:35 -08:00
Jeremy Kemper
3ee9b8f2b2 Remove Gemfile deps duplicated from AP gemspec 2009-11-14 03:27:18 -08:00
Jeremy Kemper
795213a5f4 Just use abstract_unit 2009-11-14 03:27:18 -08:00
Jeremy Kemper
313a7ea9d6 Fix bundler environment check 2009-11-14 03:27:18 -08:00
Jeremy Kemper
61843595ea No need for test stub 2009-11-14 03:27:18 -08:00
Jeremy Kemper
364a8f3902 No need to check for generated method, just redispatch 2009-11-14 01:51:52 -08:00
Jeremy Kemper
6ebb061b18 Ruby 1.9.2: use recursive flatten 2009-11-14 01:50:47 -08:00
Jeremy Kemper
f0f4dffd3b Skip pg locking test due to connection checkout deadlock detection 2009-11-14 01:22:36 -08:00
Jeremy Kemper
7eb4f2ecc5 Consolidate date & time landscape: require 'active_support/time' 2009-11-14 01:13:54 -08:00
Jeremy Kemper
92253829de Ruby 1.9.2: fix flatten_deeper to preserve nils 2009-11-14 01:12:49 -08:00
Jeremy Kemper
58c0d31487 Notifications: queue.drained? for testability in place of brittle sleeps 2009-11-13 20:58:38 -08:00
Jeremy Kemper
66fda6b894 Fix duration check for longer sleep 2009-11-13 19:28:59 -08:00
Jeremy Kemper
7ab78b9ccd CI: slow down brittle notifications tests 2009-11-13 18:57:10 -08:00
Jeremy Kemper
7b3d85db4c Revert "Split arel_table into method to get a relation and another to memoize the default relation." 
This reverts commit bd51790895.
 2009-11-13 15:30:51 -08:00
Jeremy Kemper
3f54f3100b Ruby 1.9.2: StringIO no longer has #path 2009-11-13 13:10:28 -08:00
Jeremy Kemper
2841a14f4b Ruby 1.9.2: fix broken to_ary expectation 2009-11-13 12:42:49 -08:00
Jeremy Kemper
9acc824d96 Ruby 1.9.2: disallow explicit coercion via method_missing. Only give friendly nil errors for Array and Active Record methods. 2009-11-13 12:25:54 -08:00
Jeremy Kemper
0214d337b3 Rescue handlers should never need array wrapping. Bug if so. 2009-11-13 11:00:18 -08:00
Jeremy Kemper
bd51790895 Split arel_table into method to get a relation and another to memoize the default relation. 2009-11-13 10:53:19 -08:00
Jeremy Kemper
0da71980cd Missing customers fixture 2009-11-13 10:38:23 -08:00
Jeremy Kemper
3fd2624be4 Uses Hash#reverse_merge 2009-11-13 10:31:05 -08:00
Jeremy Kemper
fbbf0086ca Ruby 1.9.2: avoid #flatten 2009-11-13 09:52:53 -08:00
Jeremy Kemper
18d4976516 Prefer Array.wrap to Array() 2009-11-13 09:52:53 -08:00
Jeremy Kemper
f07bcf015e Ruby 1.9.2: work around Array allowing method_missing for to_ary 2009-11-13 09:52:53 -08:00
Jeremy Kemper
c0ebc21493 Test that Array.wrap works with proxy objects and structs 2009-11-13 09:52:52 -08:00
José Valim
2cb47c742f Split mime responder into smaller chunks and allow action to be configured. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-11-13 09:52:52 -08:00
Joshua Peek
a28d0ea33e Remove rackmount const usage 2009-11-12 23:33:30 -06:00
Jeremy Kemper
2da432dde3 Always bundle pg and mysql for AR tests 2009-11-12 11:26:55 -08:00
David Vrensk
af44b07649 Rdoc for changes introduced in e2ed1a1ca, 36058f450. 
[#3451 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-11-12 11:21:44 -08:00
Yehuda Katz + Carl Lerche
82b9b151ff Refactor plugins 2009-11-11 18:09:16 -08:00
Jeremy Kemper
fca32eb6c5 Update AR logger subscriber for Notifications subscriber args change 2009-11-11 01:43:58 -08:00
Jeremy Kemper
322b6b29c2 test-unit 2: filter_backtrace is private 2009-11-10 21:04:00 -08:00
Jeremy Kemper
0df1dc5a72 CI: yeah, run those tests 2009-11-10 17:19:39 -08:00