Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/rails/rails into rails_master | Mikel Lindsaar | 2009-11-24 | 226 | -2695/+1914 |
|\ | |||||
| * | Add a dead --irb option mentioning upgrade path | Jeremy Kemper | 2009-11-23 | 1 | -0/+1 |
| | | |||||
| * | Set RAILS_ENV before loading config/environment | Jeremy Kemper | 2009-11-23 | 1 | -10/+7 |
| | | |||||
| * | Privatize Routing.possible_controllers and fix brittle url helper | Joshua Peek | 2009-11-23 | 3 | -83/+52 |
| | | | | | | | | controller test loading. | ||||
| * | Find all controllers in memory to use for routing | Joshua Peek | 2009-11-23 | 4 | -25/+15 |
| | | |||||
| * | with_controllers is no longer used | Joshua Peek | 2009-11-23 | 1 | -11/+0 |
| | | |||||
| * | Extract Routing.controller_constraints | Joshua Peek | 2009-11-23 | 3 | -2/+7 |
| | | |||||
| * | Refactor script/console into an object and use IRB.start instead of calling ↵ | Carlhuda | 2009-11-23 | 2 | -39/+49 |
| | | | | | | | | exec. | ||||
| * | Refactor script/server into an object that inherits from Rack::Server | Carlhuda | 2009-11-23 | 2 | -59/+62 |
| | | |||||
| * | Update rails application root detection to take into consideration a ↵ | Carlhuda | 2009-11-23 | 1 | -1/+1 |
| | | | | | | | | callstack that includes the rack library | ||||
| * | Updates notifications tests in railties to reflect changes to the ↵ | Carlhuda | 2009-11-23 | 1 | -1/+3 |
| | | | | | | | | notifications API | ||||
| * | Remove inflection reloads routes test | Joshua Peek | 2009-11-23 | 1 | -7/+0 |
| | | |||||
| * | Kill dead routing internals helpers | Joshua Peek | 2009-11-23 | 1 | -26/+0 |
| | | |||||
| * | Don't really care about reloading routes when inflections are | Joshua Peek | 2009-11-23 | 1 | -11/+0 |
| | | | | | | | | changed. | ||||
| * | RAILS_ENV falls back to RACK_ENV | Jeremy Kemper | 2009-11-23 | 1 | -2/+2 |
| | | |||||
| * | Require rackmount >= 0.2.2 | Joshua Peek | 2009-11-23 | 1 | -1/+1 |
| | | |||||
| * | Fixes remote errors in isolation tests | Yehuda Katz | 2009-11-23 | 1 | -0/+15 |
| | | |||||
| * | Pending test now passing | Jeremy Kemper | 2009-11-23 | 1 | -8/+6 |
| | | |||||
| * | Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs ↵ | David Heinemeier Hansson | 2009-11-23 | 2 | -0/+4 |
| | | | | | | | | [DHH] | ||||
| * | Revert "Revert "Assert primary key does not exist in habtm when the ↵ | Jeremy Kemper | 2009-11-23 | 5 | -31/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | association is defined, instead of doing that everytime a record is inserted."" This reverts commit 2b82708b0efb3a3458e8177beab58f0c585788ae. [#3128 state:resolved] Conflicts: activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | ||||
| * | Ensure generator fallbacks work even when a context is given. | José Valim | 2009-11-23 | 2 | -1/+8 |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | Also load generators at lib/rails_generators. | José Valim | 2009-11-23 | 2 | -22/+10 |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | Create SyncListener. Since they do not rely on Thread, they can be used on ↵ | José Valim | 2009-11-23 | 2 | -35/+74 |
| | | | | | | | | | | | | Google App Engine. Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | Explicit source no longer needed, default gems source points to gemcutter. | Jeremy Kemper | 2009-11-22 | 1 | -3/+0 |
| | | |||||
| * | macruby: no format_datetime or msg2str | Jeremy Kemper | 2009-11-21 | 1 | -2/+2 |
| | | |||||
| * | 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 |
| | |