aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-21114-857/+1820
|\
| * Turn filter_parameter_logging on by default for password and ↵David Heinemeier Hansson2009-12-201-5/+3
| | | | | | | | password_confirmation and remove contentless comments
| * 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 ↵David Heinemeier Hansson2009-12-202-6/+20
| | | | | | | | :to for simple routes
| * 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 ↵Yehuda Katz2009-12-208-14/+24
| | | | | | | | | | | | works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency)
| * | 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 ↵David Heinemeier Hansson2009-12-202-0/+11
| | | | | | | | | | | | authentication header regardless of its proxy hiding [DHH]
| * | 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
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fixes Dependency bug in ActiveSupportYehuda Katz2009-12-202-0/+2
| |
| * :to => redirect() can take a String using 1.9-style interpolation or proc ↵Yehuda Katz2009-12-203-4/+32
| | | | | | | | that takes the path parameters as a Hash
| * Add active_support/ruby/shim to the default requirements for AP componentsYehuda Katz2009-12-204-4/+4
| |
| * 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
| | | | | | | | #3563)
| * Added alert/notice from 2-3-stable and refactored redirect_to into just ↵David Heinemeier Hansson2009-12-177-77/+165
| | | | | | | | living in Redirector [DHH]
| * 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
| | | | | | | | the environment
| * 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
| | | | | | | | adding any to the load path more than once.
| * 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 ↵Will2009-12-162-2/+12
| | | | | | | | | | | | cache [#1827 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * 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
| | | | | | | | Fixes dev mode reloading [#3574 state:resolved]
| * Add test for TimeWithZone#to_i with wrapped DateTimeGeoff Buesing2009-12-151-0/+6
| |
| * Added #to_i to DateTime in ActiveSupport so #to_yaml works correctly on ↵Serguei Filimonov2009-12-153-2/+28
| | | | | | | | ActiveRecord models with DateTime attributes.
| * Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if ↵David Heinemeier Hansson2009-12-143-0/+12
| | | | | | | | !x.include?/else calls [DHH]
| * Move route reloading into railtiesJoshua Peek2009-12-147-115/+69
| |
| * Remove route loading tests since it should be tested by railtiesJoshua Peek2009-12-141-72/+0
| |
| * Fix loading plugin and engine route setsJoshua Peek2009-12-142-5/+58
| |
| * Fix response_body warning in ACJoshua Peek2009-12-141-0/+2
| |
| * Hush loading AR unless it failsJoshua Peek2009-12-141-6/+2
| |
| * Hush AP test suiteJoshua Peek2009-12-141-2/+0
| |