aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-232-3/+3
|\
| * RAILS_ENV falls back to RACK_ENVJeremy Kemper2009-11-231-2/+2
| * Require rackmount >= 0.2.2Joshua Peek2009-11-231-1/+1
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2388-1537/+907
|\|
| * Fixes remote errors in isolation testsYehuda Katz2009-11-231-0/+15
| * Pending test now passingJeremy Kemper2009-11-231-8/+6
| * Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs ...David Heinemeier Hansson2009-11-232-0/+4
| * Revert "Revert "Assert primary key does not exist in habtm when the associati...Jeremy Kemper2009-11-235-31/+14
| * Ensure generator fallbacks work even when a context is given.José Valim2009-11-232-1/+8
| * Also load generators at lib/rails_generators.José Valim2009-11-232-22/+10
| * Create SyncListener. Since they do not rely on Thread, they can be used on Go...José Valim2009-11-232-35/+74
| * Explicit source no longer needed, default gems source points to gemcutter.Jeremy Kemper2009-11-221-3/+0
| * macruby: no format_datetime or msg2strJeremy Kemper2009-11-211-2/+2
| * Fix Rails::Rack::Static deprecated constant proxyJeremy Kemper2009-11-211-1/+1
| * Update gemspec alsoJeremy Kemper2009-11-192-2/+1
| * Should be rackmount 0.2Joshua Peek2009-11-191-1/+1
| * Depend on rack-mount 0.0.2Joshua Peek2009-11-191-1/+1
| * Extended and case insensitive regexp routes aren't that important.Joshua Peek2009-11-191-15/+24
| * Update routing for rackmount 0.2 api changesJoshua Peek2009-11-191-54/+11
| * Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; script/serv...Jeremy Kemper2009-11-198-13/+13
| * Add basic nested named route support to new routing dsl. Also add aJoshua Peek2009-11-192-8/+70
| * Fix test bleedJeremy Kemper2009-11-181-1/+1
| * Final steps toward clean rails "foo"; cd foo; gem bundle; script/server workingYehuda Katz + Carl Lerche2009-11-188-13/+13
| * Check whether another lib has implemented ruby 1.9 string interp syntaxJeremy Kemper2009-11-181-1/+1
| * Extract form_authenticity_param instance method so it's overridable in subcla...Jeremy Kemper2009-11-172-1/+24
| * Insert generated association members in the same order they are specified whe...Gabe da Silveira2009-11-172-2/+25
| * Revert "Ensure Model#destroy respects optimistic locking"Jeremy Kemper2009-11-172-52/+0
| * 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
| * | 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
| |/
| * 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 memoize...Jeremy Kemper2009-11-135-13/+13
| * Ruby 1.9.2: StringIO no longer has #pathJeremy Kemper2009-11-131-1/+1