aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)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 ↵Xavier Noria2010-04-051-17/+31
| | | | are on it
* We don't need explicit :url => { :action => "create" } in form_for when ↵Rizwan Reza2010-04-051-7/+7
| | | | following Rails conventions.
* 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
| | | | | | | | | | | | | | | | | | Was not tested. This reverts commit a8c3c71af161e7d4263ad489ca2f6601bc02a9bb.
* | | 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 ↵Aman Gupta2010-04-041-3/+3
| | | | | | | | | | | | | | | | | | strange reason, finalizers created via ActionView::Template.finalizer_for cause Template instances to leak on MRI. Signed-off-by: wycats <wycats@gmail.com>
* | | 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
| |/ |/| | | | | | | | | | | | | | | | | | | ActionDispatch::Request rather than Rack::Request. * Changed ActionDispatch::Request#method to return a String, to be compatible with the Rack::Request superclass. * Changed ActionDispatch::Request#method to return the original method in the case of methodoverride and #request_method not to, to be compatible with Rack::Request
* | 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
| | | | | | | | | | | | proxying back to the controller. This potentially allows for more standalone usage of AV. It also kicked up a lot of dust in the tests, which were mocking out controllers to get this behavior. By moving it to the view, it made a lot of the tests more standalone (a win)
| * | Fix memory leak in dev modewycats2010-04-022-0/+17
| | |
| * | Key partial name cache on controller and object class *names* to avoid ↵Jeremy Kemper2010-04-021-2/+2
| | | | | | | | | | | | memory leaks in dev mode
| * | 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 ↵Rolf Bjaanes2010-04-021-1/+2
| | | | | | | | | | | | | | | | | | [#4315 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Maintain the usage of :as consistent in the router. Whenever it's supplied, ↵José Valim2010-04-022-33/+71
| | | | | | | | | | | | it changes the NAMED ROUTE. If you want to change the PATH, use :path instead. Example: resources :projects, :path => 'projetos'
* | | 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: ↵Paul Sadauskas2010-04-011-2/+2
| | | | | | | | application/json, application/jsonp (and the like), but still blacklists browsers. Essentially, we use normal content negotiation unless you include */* in your list, in which case we assume you're a browser and send HTML [#3541 state:resolved]
| * 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
| | | | | | | | | | | | [#4306 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * HTML safety: give a deprecation warning if an array of option tags is passed ↵Jeremy Kemper2010-03-312-0/+10
| | | | | | | | to select tag. Be sure to join the tag yourself and mark them .html_safe
* | 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 ↵José Valim2010-03-314-5/+16
| | | | | | | | signed cookies to work again.
| * 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
| | | | | | | | | | | | | | | | should run during framework load do: ActiveSupport.on_load(:action_controller) do # Code run in the context of AC::Base end
| * 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
| | | | | | | | [#4247 state:resolved]
| * Allow customisation of asset path generation using a proc.Craig R Webster2010-03-282-2/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set config.action_controller.asset_path_template to a proc that takes one argument - the direct, unchanged asset path - and returns a path to that asset using the scheme that your assets require. This is useful if you have a setup which scales by introducing new application servers where the mtime of the asset files may not be the same as those of the asset files on your previous servers, but it does require your web servers to have knowledge of the asset template paths that you rewrite to so it's not suitable for out-of-the-box use. An example of configuring asset path generation and rewriting these paths using Apache is included in actionpack/lib/action_view/helpers/asset_tag_helper.rb. Signed-off-by: wycats <wycats@gmail.com>
| * 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
| | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
| * html_tag option to wrap error_message_on text [#4283 state:resolved]Paco Guzman2010-03-282-9/+16
| | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * Request#content_type exists in Rack::Request, and other parts of ↵wycats2010-03-285-14/+20
| | | | | | | | | | | | Rack::Request expect it to return a String. Split the Rails API so that Request#content_type returns a String, and Request#content_mime_type returns a Mime::Type object.
| * Add constraints to resources in new routing DSLAndrew White2010-03-282-14/+73
| | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
| * 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
| |