Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'jose/perf' | Yehuda Katz | 2009-12-27 | 7 | -93/+72 |
|\ | |||||
| * | Remove ActionView inline logging to ActiveSupport::Notifications and create ↵ | José Valim | 2009-12-26 | 7 | -93/+72 |
| | | | | | | | | ActionController::Base#log_event, so everything can be logged within one listener. Also expose log_process_action as a hook for different modules to include their own information during the action processing. This allow ActiveRecord to hook and any other ORM. Finally, this commit changes 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at the point it's logged, everying already happened. | ||||
* | | Added shorthand for match 'products/overview' that expands to match ↵ | David Heinemeier Hansson | 2009-12-27 | 1 | -6/+16 |
| | | | | | | | | 'products/overview', :to => 'products#overview', :as => 'products_overview' | ||||
* | | Expect Rack 1.1 | Joshua Peek | 2009-12-26 | 1 | -1/+1 |
|/ | |||||
* | Fix tests | David Heinemeier Hansson | 2009-12-25 | 1 | -2/+2 |
| | |||||
* | Merge | David Heinemeier Hansson | 2009-12-24 | 2 | -3/+12 |
|\ | |||||
| * | Allow named_routes to be used with root, and with new DSL short-form. | Sam Ruby | 2009-12-23 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The real use case it to make all of the following act the same: root 'store#index', :as => 'store' match '/' => 'store#index', :as => 'store' match '/', :to => 'store#index', :as => 'store' The test case provided deviates from this in order to demonstrate all three forms in a single set of test routes. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Routing: fix that route shorthand shouldn't ignore other options. Raise if ↵ | Jeremy Kemper | 2009-12-23 | 1 | -2/+4 |
| | | | | | | | | :as option is given to root method since its name is always 'root' | ||||
| * | Fix bare string Rack response bodies | Jeremy Kemper | 2009-12-23 | 1 | -2/+2 |
| | | |||||
* | | Extract Mapping class from monster match method | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+12 |
|/ | |||||
* | AD::StatusCodes support is now part of rack | Joshua Peek | 2009-12-22 | 1 | -2/+2 |
| | |||||
* | Add test for root | David Heinemeier Hansson | 2009-12-21 | 1 | -0/+9 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-21 | 1 | -12/+12 |
|\ | |||||
| * | reset_session needs to be a real method so flash can override it | Joshua Peek | 2009-12-21 | 1 | -12/+12 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-21 | 6 | -8/+39 |
|\| | |||||
| * | Its now possible to use match 'stuff' => 'what#stuff' instead of using the ↵ | David Heinemeier Hansson | 2009-12-20 | 1 | -3/+13 |
| | | | | | | | | :to for simple routes | ||||
| * | Rename the RenderingController module to just plain Rendering | David Heinemeier Hansson | 2009-12-20 | 5 | -5/+5 |
| | | |||||
| * | :to => redirect() can take a String using 1.9-style interpolation or proc ↵ | Yehuda Katz | 2009-12-20 | 1 | -0/+21 |
| | | | | | | | | that takes the path parameters as a Hash | ||||
* | | Added cookies.permanent, cookies.signed, and cookies.permanent.signed ↵ | David Heinemeier Hansson | 2009-12-20 | 1 | -0/+35 |
|/ | | | | accessor for common cookie actions [DHH] | ||||
* | Pending tests for AD Response | Joshua Peek | 2009-12-17 | 1 | -0/+113 |
| | |||||
* | Don't need response prepare! | Joshua Peek | 2009-12-17 | 1 | -8/+0 |
| | |||||
* | Added alert/notice from 2-3-stable and refactored redirect_to into just ↵ | David Heinemeier Hansson | 2009-12-17 | 1 | -1/+28 |
| | | | | living in Redirector [DHH] | ||||
* | Fully expand relative rails framework paths and make sure we aren't | Joshua Peek | 2009-12-16 | 1 | -8/+7 |
| | | | | adding any to the load path more than once. | ||||
* | Move route reloading into railties | Joshua Peek | 2009-12-14 | 1 | -13/+0 |
| | |||||
* | Remove route loading tests since it should be tested by railties | Joshua Peek | 2009-12-14 | 1 | -72/+0 |
| | |||||
* | Hush loading AR unless it fails | Joshua Peek | 2009-12-14 | 1 | -6/+2 |
| | |||||
* | TestProcess belongs in AD | Joshua Peek | 2009-12-12 | 2 | -5/+5 |
| | |||||
* | "new" and "edit" name routes always need to be prepend to the | Joshua Peek | 2009-12-11 | 1 | -0/+14 |
| | | | | named_route [#3561 state:resolved] | ||||
* | Remove fancy method not allowed resource exceptions since they are | Joshua Peek | 2009-12-11 | 2 | -10/+7 |
| | | | | too much of a hack | ||||
* | Kill RouteSet#recognize | Joshua Peek | 2009-12-10 | 1 | -126/+68 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | Yehuda Katz | 2009-12-10 | 18 | -121/+112 |
|\ | |||||
| * | Check block arity passed to routes draw so you don't need to use | Joshua Peek | 2009-12-09 | 1 | -1/+1 |
| | | | | | | | | |map| | ||||
| * | Simpler RenderOption API -- removes the need for registering the types and ↵ | Carlhuda | 2009-12-09 | 1 | -0/+14 |
| | | | | | | | | extending a module | ||||
| * | More test porting | Joshua Peek | 2009-12-08 | 3 | -10/+9 |
| | | |||||
| * | Tack format onto resource routes | Joshua Peek | 2009-12-08 | 1 | -3/+15 |
| | | |||||
| * | Use new routing dsl in tests | Joshua Peek | 2009-12-08 | 15 | -67/+56 |
| | | |||||
| * | Fix ambiguous access_token scoping example | Joshua Peek | 2009-12-08 | 1 | -5/+5 |
| | | |||||
| * | Routes added under resource collection should be prefixed with | Joshua Peek | 2009-12-08 | 1 | -13/+4 |
| | | | | | | | | resource collection name | ||||
| * | Fixed named prefix scope in resource member and collection actions | Joshua Peek | 2009-12-07 | 1 | -16/+6 |
| | | |||||
| * | named_prefix doesn't join with "_" | Joshua Peek | 2009-12-07 | 1 | -1/+1 |
| | | |||||
| * | Allow name_prefix to be pass into scope | Joshua Peek | 2009-12-07 | 1 | -8/+4 |
| | | |||||
| * | Allow scope to take :path and :controller options | Joshua Peek | 2009-12-07 | 1 | -1/+1 |
| | | |||||
* | | Responder redirects to resource if destroy fails. | José Valim | 2009-12-07 | 1 | -8/+34 |
|/ | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
* | Deprecate recalling generation params when the defaults are nil | Joshua Peek | 2009-12-06 | 1 | -3/+1 |
| | |||||
* | Update rackmount to fix some pending tests | Joshua Peek | 2009-12-05 | 1 | -13/+9 |
| | |||||
* | Reorganize autoloads: | Carlhuda | 2009-12-02 | 5 | -20/+20 |
| | | | | | | | | | | | | | | | | | | | | | * A new module (ActiveSupport::Autoload) is provide that extends autoloading with new behavior. * All autoloads in modules that have extended ActiveSupport::Autoload will be eagerly required in threadsafe environments * Autoloads can optionally leave off the path if the path is the same as full_constant_name.underscore * It is possible to specify that a group of autoloads live under an additional path. For instance, all of ActionDispatch's middlewares are ActionDispatch::MiddlewareName, but they live under "action_dispatch/middlewares/middleware_name" * It is possible to specify that a group of autoloads are all found at the same path. For instance, a number of exceptions might all be declared there. * One consequence of this is that testing-related constants are not autoloaded. To get the testing helpers for a given component, require "component_name/test_case". For instance, "action_controller/test_case". * test_help.rb, which is automatically required by a Rails application's test helper, requires the test_case.rb for all active components, so this change will not be disruptive in existing or new applications. | ||||
* | Stop escaping "[]" in query string | Joshua Peek | 2009-12-02 | 1 | -3/+3 |
| | |||||
* | Ensure Cache-Control max-age is an integer | Jeremy Kemper | 2009-12-02 | 1 | -1/+1 |
| | |||||
* | Fix parens warning in ajax test | Joshua Peek | 2009-12-01 | 1 | -6/+6 |
| | |||||
* | Make recognize try to constantize controller to see if it exists | Joshua Peek | 2009-12-01 | 2 | -3/+12 |
| |