aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-04-021-2/+2
|\
| * Slightly less annoying check for acceptable mime_types. This allows Accept: a...Paul Sadauskas2010-04-011-2/+2
* | Merge commit 'rails/master'Xavier Noria2010-03-3116-36/+96
|\|
| * Deprecate cookie_verifier_secret in favor of config.cookie_secret allowing si...José Valim2010-03-311-3/+3
| * Consistent routing languageJoshua Peek2010-03-301-10/+10
| * Fix stack overflow bug in integration test router helpersJoshua Peek2010-03-301-1/+1
| * Add more tests and docs to uncountable routes. [#3930 state:resolved]Rizwan Reza2010-03-281-1/+2
| * Add _index to named collection routes for uncountable resources (e.g. Sheep)Jan De Poorter2010-03-281-1/+5
| * Request#content_type exists in Rack::Request, and other parts of Rack::Reques...wycats2010-03-283-7/+13
| * Add constraints to resources in new routing DSLAndrew White2010-03-281-14/+47
| * Merge remote branch 'rizwan/restrict'wycats2010-03-2810-0/+14
| |\
| | * adds missing requires for Object#blank? and Object#present?Xavier Noria2010-03-289-0/+13
| | * 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
* | Update routing documentation to the new way of specifying HTTP method restric...Andrew White2010-03-311-9/+21
* | Mark ActionDispatch::Routing::DeprecatedMapper as nodoc to hide old documenta...Andrew White2010-03-311-1/+1
|/
* Fix a mistake in the documentation (ht: Evgeniy Dolzhenko) [#4217 state:resol...wycats2010-03-271-1/+1
* Fix named routes for member actions of singleton resources [#4266 state:resol...Andrew White2010-03-271-1/+1
* Add parameter defaults support to new routing DSL [#4265 state:resolved]Andrew White2010-03-271-1/+19
* Make X-Sendfile default to "" so it works correctly in dev mode.wycats2010-03-261-1/+1
* Merge branch 'master' into docrailswycats2010-03-2610-116/+66
|\
| * Move application configuration to the application configuration object, remov...José Valim2010-03-261-2/+1
| * Rails router automatically calculated for you the controller and named routes...José Valim2010-03-261-5/+3
| * Protect routes again so they don't end up as actions. We need a better soluti...wycats2010-03-231-0/+1
| * open_session can just return the a dup of the current context.wycats2010-03-221-24/+3
| * Make router shortcuts more polite to URLs starting with a leading slash.José Valim2010-03-221-15/+17
| * Clean up Mime::Type and remove deprecated stuff (from 2.3).José Valim2010-03-201-7/+1
| * We seem to have removed the URL helpers from ActionView subclasses...wycats2010-03-181-0/+1
| * Each controller class has it's own view context subclass. This removes the ne...Carlhuda2010-03-181-3/+4
| * All tests pass without memoizing view_contextCarlhuda2010-03-181-3/+2
| * Deleting and setting a cookie in the same request was brokenMathias Biilmann Christensen2010-03-171-0/+1
| * Get modules back into integration testsCarlhuda2010-03-171-0/+3
| * Fix for missing dependency in ActionDispatch::IntegrationMathias Biilmann Christensen2010-03-171-0/+1
| * Modify assert_template to use instrumentationCarlhuda2010-03-171-52/+0
| * Install url helpers on module instance so they can be accessedJoshua Peek2010-03-171-5/+13
| * Eliminate warnings for AM on 1.8wycats2010-03-161-1/+0
| * Another missing requirewycats2010-03-161-0/+1
| * Make sure options[:anchor] is correct in shorthand caseswycats2010-03-161-2/+5
| * Do not always include the named URL helpers into AC::Base and AV::Base.Carl Lerche2010-03-162-3/+16
| * Make RouteSet#finalize! a NOOP if it's been called already. Call finalize! th...Carl Lerche2010-03-161-0/+5
| * Integration test url options should account for :protocol not just https?Jeremy Kemper2010-03-151-8/+2
| * Revert "Reinstate old default_url_options method signature"Jeremy Kemper2010-03-151-1/+1
| * Reinstate old default_url_options method signatureJeremy Kemper2010-03-151-1/+1
* | Merge remote branch 'mainstream/master'Pratik Naik2010-03-151-8/+8
|\|
| * Don't force singularization of singleton resource names, e.g. /preferences [#...Andrew White2010-03-151-8/+8
* | Merge remote branch 'mainstream/master'Pratik Naik2010-03-1222-362/+647
|\|
| * Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-103-16/+69
| |\
| | * skip_relative_url_root url_for option is deadJoshua Peek2010-03-092-3/+1