aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* revises some <%= in rdocXavier Noria2010-04-054-4/+5
* <% yield to <%= yield in rdoc of _layout_for, and copy-edits it now that we a...Xavier Noria2010-04-051-17/+31
* We don't need explicit :url => { :action => "create" } in form_for when follo...Rizwan Reza2010-04-051-7/+7
* Merge commit 'docrails/master'Xavier Noria2010-04-044-17/+17
|\
| * Merge branch 'master' of github.com:lifo/docrailsAndrew White2010-04-0427-629/+762
| |\
| | * :action => "create" added to form_for with name only to show appropiate behaviorSantiago Pastorino2010-04-031-6/+6
| | * :action => "update" used in a non RESTful way confusesSantiago Pastorino2010-04-031-11/+11
| * | Update various documentation examples to use new routing DSLAndrew White2010-04-043-4/+4
* | | Reapply redirect {|params, request| } with passing tests this timewycats2010-04-042-1/+16
* | | Revert "Pass in the request as an optional second parameter to redirect"Jeremy Kemper2010-04-041-1/+1
* | | Fix signed cookies by explicitly passing config to the cookie jarJeremy Kemper2010-04-042-25/+22
* | | Use a constant proc to generate ActionView::Template finalizers. For some str...Aman Gupta2010-04-041-3/+3
* | | Pass in the request as an optional second parameter to redirectwycats2010-04-031-1/+1
* | | * Change the object used in routing constraints to be an instance ofwycats2010-04-0313-43/+152
| |/ |/|
* | Merge commit 'rails/master'Xavier Noria2010-04-0321-351/+430
|\ \
| * | Refactored url_for in AV to have its own instances of the helpers instead of ...wycats2010-04-0314-313/+338
| * | Fix memory leak in dev modewycats2010-04-022-0/+17
| * | Key partial name cache on controller and object class *names* to avoid memory...Jeremy Kemper2010-04-021-2/+2
| * | Add a test which ensures action_dispatch.show_exceptions is properly disabled.José Valim2010-04-022-4/+2
| * | Raise exceptions instead of rendering error templates in test environment [#4...Rolf Bjaanes2010-04-021-1/+2
| * | Maintain the usage of :as consistent in the router. Whenever it's supplied, i...José Valim2010-04-022-33/+71
* | | Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-04-027-265/+319
|\| | | |/ |/|
| * Slightly less annoying check for acceptable mime_types. This allows Accept: a...Paul Sadauskas2010-04-011-2/+2
| * Release is today, yoDavid Heinemeier Hansson2010-04-011-1/+2
| * Updated changelogs to differentiate beta1 and beta2wycats2010-04-011-1/+3
| * Updated changelogswycats2010-04-011-259/+287
| * Prep for beta2, depend on latest BundlerDavid Heinemeier Hansson2010-04-011-1/+1
| * Fix error in number_with_precision with :significant option and zero value [#...Bernardo de Pádua2010-04-012-2/+15
| * HTML safety: give a deprecation warning if an array of option tags is passed ...Jeremy Kemper2010-03-312-0/+10
* | Merge commit 'rails/master'Xavier Noria2010-03-3156-205/+466
|\|
| * yield always return an array, so we don't need to use .key?José Valim2010-03-311-6/+1
| * Deprecate cookie_verifier_secret in favor of config.cookie_secret allowing si...José Valim2010-03-314-5/+16
| * Add a test which ensures slugs in :id work.José Valim2010-03-311-0/+8
| * Consistent routing languageJoshua Peek2010-03-3011-138/+137
| * Fix stack overflow bug in integration test router helpersJoshua Peek2010-03-302-1/+48
| * Replace the placeholder base_hook API with on_load. To specify some code thatwycats2010-03-296-12/+11
| * Fix dom_id for ActiveRecord [#4296 state:resolved]José Valim2010-03-301-2/+2
| * Updated asset_template_path to asset_path and have it also support a String [...wycats2010-03-282-11/+19
| * Allow customisation of asset path generation using a proc.Craig R Webster2010-03-282-2/+75
| * Add more tests and docs to uncountable routes. [#3930 state:resolved]Rizwan Reza2010-03-282-3/+6
| * Add _index to named collection routes for uncountable resources (e.g. Sheep)Jan De Poorter2010-03-282-1/+14
| * html_tag option to wrap error_message_on text [#4283 state:resolved]Paco Guzman2010-03-282-9/+16
| * Request#content_type exists in Rack::Request, and other parts of Rack::Reques...wycats2010-03-285-14/+20
| * Add constraints to resources in new routing DSLAndrew White2010-03-282-14/+73
| * Merge remote branch 'rizwan/restrict'wycats2010-03-2824-0/+31
| |\
| | * adds missing requires for Object#blank? and Object#present?Xavier Noria2010-03-2823-0/+30
| | * adds missing requires for Object#duplicable?Xavier Noria2010-03-281-0/+1
| * | Rails 3 application can run performance tests now. [#4171 state:resolved]Rizwan Reza2010-03-281-1/+3
| |/
* | ActionController::Resources has gone awayAndrew White2010-03-311-2/+1
* | Remove routing implementation details from RDocAndrew White2010-03-313-12/+12