Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Pass in the request as an optional second parameter to redirect" | Jeremy Kemper | 2010-04-04 | 1 | -1/+1 |
| | | | | | | Was not tested. This reverts commit a8c3c71af161e7d4263ad489ca2f6601bc02a9bb. | ||||
* | Fix signed cookies by explicitly passing config to the cookie jar | Jeremy Kemper | 2010-04-04 | 2 | -25/+22 |
| | |||||
* | Use a constant proc to generate ActionView::Template finalizers. For some ↵ | Aman Gupta | 2010-04-04 | 1 | -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 redirect | wycats | 2010-04-03 | 1 | -1/+1 |
| | |||||
* | * Change the object used in routing constraints to be an instance of | wycats | 2010-04-03 | 7 | -34/+63 |
| | | | | | | | | | | | 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 Noria | 2010-04-03 | 10 | -53/+94 |
|\ | |||||
| * | Refactored url_for in AV to have its own instances of the helpers instead of ↵ | wycats | 2010-04-03 | 5 | -23/+53 |
| | | | | | | | | 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 mode | wycats | 2010-04-02 | 1 | -0/+9 |
| | | |||||
| * | Key partial name cache on controller and object class *names* to avoid ↵ | Jeremy Kemper | 2010-04-02 | 1 | -2/+2 |
| | | | | | | | | memory leaks in dev mode | ||||
| * | Add a test which ensures action_dispatch.show_exceptions is properly disabled. | José Valim | 2010-04-02 | 2 | -4/+2 |
| | | |||||
| * | Raise exceptions instead of rendering error templates in test environment ↵ | Rolf Bjaanes | 2010-04-02 | 1 | -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é Valim | 2010-04-02 | 1 | -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/rails | Rizwan Reza | 2010-04-02 | 4 | -5/+13 |
|\| | |||||
| * | Slightly less annoying check for acceptable mime_types. This allows Accept: ↵ | Paul Sadauskas | 2010-04-01 | 1 | -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] | ||||
| * | Prep for beta2, depend on latest Bundler | David Heinemeier Hansson | 2010-04-01 | 1 | -1/+1 |
| | | |||||
| * | Fix error in number_with_precision with :significant option and zero value ↵ | Bernardo de Pádua | 2010-04-01 | 1 | -2/+6 |
| | | | | | | | | | | | | [#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 Kemper | 2010-03-31 | 1 | -0/+4 |
| | | | | | | | | to select tag. Be sure to join the tag yourself and mark them .html_safe | ||||
* | | Merge commit 'rails/master' | Xavier Noria | 2010-03-31 | 41 | -77/+227 |
|\| | |||||
| * | yield always return an array, so we don't need to use .key? | José Valim | 2010-03-31 | 1 | -6/+1 |
| | | |||||
| * | Deprecate cookie_verifier_secret in favor of config.cookie_secret allowing ↵ | José Valim | 2010-03-31 | 3 | -4/+15 |
| | | | | | | | | signed cookies to work again. | ||||
| * | Consistent routing language | Joshua Peek | 2010-03-30 | 3 | -18/+18 |
| | | |||||
| * | Fix stack overflow bug in integration test router helpers | Joshua Peek | 2010-03-30 | 1 | -1/+1 |
| | | |||||
| * | Replace the placeholder base_hook API with on_load. To specify some code that | wycats | 2010-03-29 | 6 | -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é Valim | 2010-03-30 | 1 | -2/+2 |
| | | |||||
| * | Updated asset_template_path to asset_path and have it also support a String ↵ | wycats | 2010-03-28 | 1 | -10/+11 |
| | | | | | | | | [#4247 state:resolved] | ||||
| * | Allow customisation of asset path generation using a proc. | Craig R Webster | 2010-03-28 | 1 | -2/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Reza | 2010-03-28 | 1 | -1/+2 |
| | | |||||
| * | Add _index to named collection routes for uncountable resources (e.g. Sheep) | Jan De Poorter | 2010-03-28 | 1 | -1/+5 |
| | | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com> | ||||
| * | html_tag option to wrap error_message_on text [#4283 state:resolved] | Paco Guzman | 2010-03-28 | 1 | -9/+12 |
| | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Request#content_type exists in Rack::Request, and other parts of ↵ | wycats | 2010-03-28 | 3 | -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 DSL | Andrew White | 2010-03-28 | 1 | -14/+47 |
| | | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com> | ||||
| * | Merge remote branch 'rizwan/restrict' | wycats | 2010-03-28 | 24 | -0/+31 |
| |\ | |||||
| | * | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 23 | -0/+30 |
| | | | |||||
| | * | adds missing requires for Object#duplicable? | Xavier Noria | 2010-03-28 | 1 | -0/+1 |
| | | | |||||
| * | | Rails 3 application can run performance tests now. [#4171 state:resolved] | Rizwan Reza | 2010-03-28 | 1 | -1/+3 |
| |/ | |||||
* | | ActionController::Resources has gone away | Andrew White | 2010-03-31 | 1 | -2/+1 |
| | | |||||
* | | Remove routing implementation details from RDoc | Andrew White | 2010-03-31 | 3 | -12/+12 |
| | | |||||
* | | Update routing documentation to the new way of specifying HTTP method ↵ | Andrew White | 2010-03-31 | 1 | -9/+21 |
| | | | | | | | | restrictions | ||||
* | | Mark ActionDispatch::Routing::DeprecatedMapper as nodoc to hide old ↵ | Andrew White | 2010-03-31 | 1 | -1/+1 |
|/ | | | | documentation until it's removed | ||||
* | Ensure details are frozen after @details_keys lookup. The implementation ↵ | José Valim | 2010-03-27 | 3 | -16/+19 |
| | | | | waits to freeze until the last required moment, to avoid duping hashes. | ||||
* | Missing require | wycats | 2010-03-27 | 1 | -0/+1 |
| | |||||
* | Fixes a bug where error_messages_for was returning an empty div [#4048 ↵ | wycats | 2010-03-27 | 1 | -1/+1 |
| | | | | state:resolved] (ht: Geoff Garside) | ||||
* | Recovers error_messages for ActiveRecordInstanceTag. [#4078 state:resolved] | Daniel Rodríguez Troitiño | 2010-03-27 | 1 | -0/+4 |
| | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Use ActiveSupport::Autoload for view helpers. [#4237 state:resolved] | Sam Elliott and Ryan Bigg | 2010-03-27 | 1 | -24/+26 |
| | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Fix a mistake in the documentation (ht: Evgeniy Dolzhenko) [#4217 ↵ | wycats | 2010-03-27 | 1 | -1/+1 |
| | | | | state:resolved] | ||||
* | Fix named routes for member actions of singleton resources [#4266 ↵ | Andrew White | 2010-03-27 | 1 | -1/+1 |
| | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Add parameter defaults support to new routing DSL [#4265 state:resolved] | Andrew White | 2010-03-27 | 1 | -1/+19 |
| | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Fixes typo (ht: Claudio Poli) [#4107 state:closed] | wycats | 2010-03-26 | 1 | -1/+1 |
| | |||||
* | Make X-Sendfile default to "" so it works correctly in dev mode. | wycats | 2010-03-26 | 1 | -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 docrails | wycats | 2010-03-26 | 50 | -644/+982 |
|\ |