aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MergeDavid Heinemeier Hansson2009-12-2242-385/+354
|\
| * All AMo modules are safe to deferJoshua Peek2009-12-222-23/+20
| * All ARes modules are safe to deferJoshua Peek2009-12-222-10/+11
| * All AM modules are safe to deferJoshua Peek2009-12-224-35/+17
| * Flip deferrable autoload conventionJoshua Peek2009-12-2213-261/+290
| * All AD modules are "deferrable"Joshua Peek2009-12-2210-23/+35
| * Use Rack::Runtime middleware so the reported time includes the entire middlew...Joshua Peek2009-12-222-1/+1
| * Referer and user agent are in Rack::RequestJoshua Peek2009-12-221-1/+1
| * AD::StatusCodes support is now part of rackJoshua Peek2009-12-229-46/+12
| * Float on rack/master in preparation for rack 1.1 gem releaseJoshua Peek2009-12-222-2/+2
| * Make ActionMailer::Base inherit from AbstractController::BaseJosé Valim2009-12-228-81/+63
* | Dont auto require rubygems, move dep on rack-test to GemfileDavid Heinemeier Hansson2009-12-222-3/+3
* | Dont encourage __FILE__ bullshitDavid Heinemeier Hansson2009-12-221-2/+2
|/
* Add test for rootDavid Heinemeier Hansson2009-12-211-0/+9
* Merge branch 'master' of github.com:rails/railsJoshua Peek2009-12-2121-248/+249
|\
| * Blog -> Blog::Application. Leave the toplevel module up for grabs.Jeremy Kemper2009-12-215-35/+37
| * Fix the documentation for root :to. It should use a fully qualified controlle...David Heinemeier Hansson2009-12-211-1/+1
| * Fix ActionMailer. The fact that ActionMailer::Base does not inherit from Abst...Carlhuda2009-12-211-0/+3
| * Dont need to specify password_confirmation, that happens automaticallyDavid Heinemeier Hansson2009-12-211-1/+1
| * Replace reopening the class with App.configure as an alias to class_evalCarlhuda2009-12-214-3/+7
| * test.rb, dev.rb, and production.rb just reopen the Application class; no more...Carlhuda2009-12-2110-103/+104
| * Dont introspect inline templates for the logger and cleanup a few styling issuesDavid Heinemeier Hansson2009-12-212-18/+13
* | Update routes.rb template to use App nameJoshua Peek2009-12-219-14/+29
|/
* Give the builtin controllers their own routes.rb now that the legacy catch-al...David Heinemeier Hansson2009-12-213-0/+8
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-215-16/+38
|\
| * Default route was removed from default route config, patch up failing tests.Joshua Peek2009-12-211-0/+18
| * Less annoying RoutingError messageJoshua Peek2009-12-211-2/+2
| * reset_session needs to be a real method so flash can override itJoshua Peek2009-12-212-13/+17
| * Update CI bundlerJoshua Peek2009-12-211-1/+1
* | Its cookie_verifier_secretDavid Heinemeier Hansson2009-12-211-1/+1
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-211-0/+7
|\|
| * Missed changelog entry for :inverse_ofJeremy Kemper2009-12-211-0/+7
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-2149-196/+827
|\|
| * Turn filter_parameter_logging on by default for password and password_confirm...David Heinemeier Hansson2009-12-201-5/+3
| * Show the new short-form in an exampleDavid Heinemeier Hansson2009-12-201-1/+1
| * Its now possible to use match 'stuff' => 'what#stuff' instead of using the :t...David Heinemeier Hansson2009-12-202-6/+20
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-2010-35/+24
| |\
| | * We don't need AD parse_configJoshua Peek2009-12-202-21/+0
| | * AC::Head now doesn't have an unfulfilled Rendering dependency, and instead wo...Yehuda Katz2009-12-208-14/+24
| * | Mark the wild controller route as legacy an comment it outDavid Heinemeier Hansson2009-12-201-5/+3
| |/
| * Just a little tidyingDavid Heinemeier Hansson2009-12-201-24/+22
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-2013-84/+67
| |\
| | * Rename RackConvenience => RackDelegationJoshua Peek2009-12-208-10/+10
| | * Merge Session stuff into RackConvenienceJoshua Peek2009-12-207-74/+56
| | * Missing acts_like dependencyYehuda Katz2009-12-201-0/+1
| * | Added ActionDispatch::Request#authorization to access the http authentication...David Heinemeier Hansson2009-12-202-0/+11
| * | Rename RenderOptions to RenderersDavid Heinemeier Hansson2009-12-203-6/+5
| |/
| * Renamed Redirector to Redirecting (its a module, not a class)David Heinemeier Hansson2009-12-204-4/+4
| * Rename the RenderingController module to just plain RenderingDavid Heinemeier Hansson2009-12-2016-18/+18
| * Remove annoying and useless meta commentsJoshua Peek2009-12-201-6/+6