aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2520-142/+154
|\
| * Fix the application.rb generatorCarl Lerche2009-11-251-1/+1
| * Fix the rackup test to correctly use Rack::Builder.parse_fileCarl Lerche2009-11-251-1/+2
| * Load application specific rake tasks in the application objectCarl Lerche2009-11-252-5/+2
| * Revert "macruby: no format_datetime or msg2str"Jeremy Kemper2009-11-241-2/+2
| * Have script/* and Rakefile use the application objectCarlhuda2009-11-2415-47/+61
| * Refactor script/dbconsole into an objectCarlhuda2009-11-242-80/+90
| * Use Rails.env after loading environmentJeremy Kemper2009-11-241-2/+2
| * Quieter rake test runnerJoshua Peek2009-11-242-10/+0
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2414-255/+177
|\|
| * Add a dead --irb option mentioning upgrade pathJeremy Kemper2009-11-231-0/+1
| * Set RAILS_ENV before loading config/environmentJeremy Kemper2009-11-231-10/+7
| * Privatize Routing.possible_controllers and fix brittle url helperJoshua Peek2009-11-233-83/+52
| * Find all controllers in memory to use for routingJoshua Peek2009-11-234-25/+15
| * with_controllers is no longer usedJoshua Peek2009-11-231-11/+0
| * Extract Routing.controller_constraintsJoshua Peek2009-11-233-2/+7
| * Refactor script/console into an object and use IRB.start instead of calling e...Carlhuda2009-11-232-39/+49
| * Refactor script/server into an object that inherits from Rack::ServerCarlhuda2009-11-232-59/+62
| * Update rails application root detection to take into consideration a callstac...Carlhuda2009-11-231-1/+1
| * Updates notifications tests in railties to reflect changes to the notificatio...Carlhuda2009-11-231-1/+3
| * Remove inflection reloads routes testJoshua Peek2009-11-231-7/+0
| * Kill dead routing internals helpersJoshua Peek2009-11-231-26/+0
| * Don't really care about reloading routes when inflections areJoshua Peek2009-11-231-11/+0
* | 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