aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Use instance_eval for schema blockJoshua Peek2009-12-203-62/+69
| * Rename define_schema => schemaJoshua Peek2009-12-203-43/+40
| * Rename SchemaDefinition => SchemaJoshua Peek2009-12-204-37/+37
| * define_schema for Active ResourceTaryn East2009-12-203-2/+609
| * Fixes Dependency bug in ActiveSupportYehuda Katz2009-12-202-0/+2
| * :to => redirect() can take a String using 1.9-style interpolation or proc tha...Yehuda Katz2009-12-203-4/+32
| * Add active_support/ruby/shim to the default requirements for AP componentsYehuda Katz2009-12-204-4/+4
* | Added cookies.permanent, cookies.signed, and cookies.permanent.signed accesso...David Heinemeier Hansson2009-12-204-38/+190
|/
* Pending tests for AD ResponseJoshua Peek2009-12-172-13/+125
* Don't need response prepare!Joshua Peek2009-12-171-8/+0
* Models with no attributes should just have empty hash fixtures [Sam] (Closes ...David Heinemeier Hansson2009-12-171-5/+9
* Added alert/notice from 2-3-stable and refactored redirect_to into just livin...David Heinemeier Hansson2009-12-177-77/+165
* Fix deprecated :vendored_at optionDavid Heinemeier Hansson2009-12-171-2/+2
* Need to lazy realize middleware options so they can be modified inJoshua Peek2009-12-161-3/+3
* Use AbstractController error constantsJoshua Peek2009-12-161-3/+2
* Fully expand relative rails framework paths and make sure we aren'tJoshua Peek2009-12-1615-61/+62
* Hush AMo test suiteJoshua Peek2009-12-161-1/+0
* ARes rake task should not worry about AS being in pathJoshua Peek2009-12-161-2/+0
* Hush ARes test suiteJoshua Peek2009-12-161-1/+0
* Hush AM test suiteJoshua Peek2009-12-161-1/+0
* Hush AS test suiteJoshua Peek2009-12-161-1/+0
* When passing force_reload = true to an association, don't use the query cache...Will2009-12-162-2/+12
* Add the ability for plugins to set default configuration settings.Carl Lerche2009-12-157-18/+142
* Procs don't call themselvesJoshua Peek2009-12-152-1/+33