aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* 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-034-31/+55
| | | | | | | | | | | 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-033-28/+30
|\
| * 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-021-25/+28
| | | | | | | | 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-021-2/+2
|\|
| * 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]
* | Merge commit 'rails/master'Xavier Noria2010-03-3116-36/+96
|\|
| * Deprecate cookie_verifier_secret in favor of config.cookie_secret allowing ↵José Valim2010-03-311-3/+3
| | | | | | | | signed cookies to work again.
| * 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
| | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
| * Request#content_type exists in Rack::Request, and other parts of ↵wycats2010-03-283-7/+13
| | | | | | | | | | | | 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-281-14/+47
| | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
| * 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 ↵Andrew White2010-03-311-9/+21
| | | | | | | | restrictions
* | Mark ActionDispatch::Routing::DeprecatedMapper as nodoc to hide old ↵Andrew White2010-03-311-1/+1
|/ | | | documentation until it's removed
* Fix a mistake in the documentation (ht: Evgeniy Dolzhenko) [#4217 ↵wycats2010-03-271-1/+1
| | | | state:resolved]
* Fix named routes for member actions of singleton resources [#4266 ↵Andrew White2010-03-271-1/+1
| | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* Add parameter defaults support to new routing DSL [#4265 state:resolved]Andrew White2010-03-271-1/+19
| | | Signed-off-by: wycats <wycats@gmail.com>
* Make X-Sendfile default to "" so it works correctly in dev mode.wycats2010-03-261-1/+1
| | | | | Provide a default in production.rb that can be modified, so that people who care about sendfile performance in production mode can get better performance easily.
* Merge branch 'master' into docrailswycats2010-03-2610-116/+66
|\
| * Move application configuration to the application configuration object, ↵José Valim2010-03-261-2/+1
| | | | | | | | remove railtie_name and engine_name and allow to set the configuration object.
| * Rails router automatically calculated for you the controller and named ↵José Valim2010-03-261-5/+3
| | | | | | | | | | | | | | | | | | routes in the following scenarios: match "home/about" #=> maps to home#about with named route home_about_path match "about" #=> does not work because it cannot guess the controller match "about" => "home#about" #=> maps to home#about with named route home_about_path match "home/about", :as => "about" #=> maps to home#about with named route about_path
| * Protect routes again so they don't end up as actions. We need a better ↵wycats2010-03-231-0/+1
| | | | | | | | solution than this.
| * open_session can just return the a dup of the current context.wycats2010-03-221-24/+3
| | | | | | | | | | At this point, its entire purpose in the open_session {} case was to delegate back to the IntegrationTest anyway.
| * 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 ↵Carlhuda2010-03-181-3/+4
| | | | | | | | need for ActionView::Base.for_controller
| * 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
| | | | | | | | | | | | | | | | Made sure to remove a cookie from @deleted_cookies when set [#4211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Get modules back into integration testsCarlhuda2010-03-171-0/+3
| |
| * Fix for missing dependency in ActionDispatch::IntegrationMathias Biilmann Christensen2010-03-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | When running cucumber features from a new rails 3 app requiring 'cucumber/rails/world' would raise: uninitialized constant ActionDispatch::Integration::Session::Test (NameError) Fixed by requiring 'test/unit/assertions' in action_dispatch/integration Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * 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
| | | | | | | | globally
| * 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! ↵Carl Lerche2010-03-161-0/+5
| | | | | | | | the first time call() and url_for() are called if the RouteSet has not been finalized yet.
| * 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
| | | | | | | | This reverts commit 5913dd478150710fc0b72a0568f68e13c958d6bc.