Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Accept both regexps and strings for LOCALHOST. | José Valim | 2010-06-08 | 1 | -2/+2 |
| | |||||
* | Make sure that rails recognized the full notation of IPv6 loopback address, ↵ | Prem Sichanugrist | 2010-06-08 | 2 | -3/+3 |
| | | | | | | and recognize 127.0.0.0/8 in IPv4 Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix resources ignoring scope options | Andrew White | 2010-06-08 | 2 | -4/+32 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Made markdown honor :safe option and handle safe input. Also added tests for ↵ | rohit | 2010-06-08 | 2 | -2/+38 |
| | | | | | | | | markdown. [#4794 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Add support for actions on a new resource to the new routing DSL [#4328 ↵ | Andrew White | 2010-06-08 | 2 | -29/+118 |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fixed textilize_without_paragraph and added tests for it. [#4792 state:resolved] | rohit | 2010-06-08 | 2 | -1/+33 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-06-08 | 3 | -3/+75 |
|\ | |||||
| * | Add shallow routes to the new router [Closes #3765] | Diego Carrion | 2010-06-07 | 3 | -3/+75 |
| | | |||||
* | | Updating image_tag to support cid:content_id "URLs" | Mikel Lindsaar | 2010-06-07 | 2 | -2/+14 |
|/ | |||||
* | regular expressions are usually ASCII-encoded, so force_encoding the content ↵ | wycats | 2010-06-07 | 2 | -2/+1 |
| | | | | of a Node to the encoding of the regular expression is wrong. | ||||
* | Fix case when rendering a partial inside RJS with inherited layout [#4786 ↵ | José Valim | 2010-06-07 | 2 | -1/+4 |
| | | | | state:resolved] | ||||
* | Makes text_helper methods sanitize the input if the input is not safe or ↵ | Santiago Pastorino | 2010-06-07 | 2 | -22/+118 |
| | | | | :safe => true option is not provided | ||||
* | content_tag_string shouldn't escape_html if escape param is false | Santiago Pastorino | 2010-06-07 | 2 | -1/+3 |
| | |||||
* | Make named helpers unprotected without becoming actions [#4696 state:resolved] | wycats | 2010-06-07 | 2 | -1/+12 |
| | |||||
* | member on resource should not expect an ID. | José Valim | 2010-06-07 | 2 | -6/+3 |
| | |||||
* | Make AP test suite green once again and speed up performance in layouts ↵ | José Valim | 2010-06-07 | 4 | -45/+39 |
| | | | | lookup for some cases. | ||||
* | Router accepts member routes on resource. [#4624 state:resolved] | Rizwan Reza | 2010-06-06 | 2 | -5/+27 |
| | |||||
* | Formats should always be an array. | Jeremy Kemper | 2010-06-06 | 1 | -1/+1 |
| | |||||
* | Reset request.parameters after assigning params for functional tests | Jeremy Kemper | 2010-06-06 | 1 | -2/+4 |
| | |||||
* | Simplify middleware stack lazy compares using named const references | Jeremy Kemper | 2010-06-05 | 1 | -13/+5 |
| | |||||
* | Bump i18n to 0.4.1 | Jeremy Kemper | 2010-06-05 | 1 | -1/+1 |
| | |||||
* | Restore flash sweep | Jeremy Kemper | 2010-06-05 | 1 | -1/+1 |
| | |||||
* | Optimize LookupContext | wycats | 2010-06-04 | 4 | -14/+37 |
| | |||||
* | No need to unescape params twice if we came from Rack::Mount | wycats | 2010-06-04 | 1 | -7/+7 |
| | |||||
* | Memoizing methods on request means we need to clear them out on recycle! | wycats | 2010-06-04 | 1 | -3/+3 |
| | |||||
* | Stop the flash middleware from forcibly loading sessions even if the user ↵ | wycats | 2010-06-04 | 2 | -6/+6 |
| | | | | doesn't use sessions at all | ||||
* | Improve performance of commonly used request methods | wycats | 2010-06-04 | 1 | -7/+19 |
| | |||||
* | Include backtrace in failsafe log. Rescue possible exceptions in failsafe ↵ | Jeremy Kemper | 2010-06-04 | 2 | -2/+2 |
| | | | | response. | ||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2010-06-02 | 1 | -2/+1 |
|\ | |||||
| * | Add an asset_host accessor for consistency. | José Valim | 2010-06-02 | 1 | -2/+1 |
| | | |||||
* | | Missed the extraction | David Heinemeier Hansson | 2010-06-02 | 1 | -0/+9 |
|/ | |||||
* | Extract assets paths and make them available to Action Mailer as well | David Heinemeier Hansson | 2010-06-02 | 2 | -1/+3 |
| | |||||
* | Changes made while working on upgrading cells to Rails 3 | wycats | 2010-06-02 | 5 | -4/+8 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | wycats | 2010-06-02 | 7 | -45/+92 |
|\ | |||||
| * | revises the documentation of String#truncate and the truncate helper | Xavier Noria | 2010-06-02 | 1 | -9/+9 |
| | | |||||
| * | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2010-06-01 | 1 | -0/+2 |
| |\ | |||||
| | * | Unforce builder from AS | Santiago Pastorino | 2010-06-01 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Unforce tzinfo from AS | Santiago Pastorino | 2010-06-01 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Extracted String#truncate from TextHelper#truncate [DHH] | David Heinemeier Hansson | 2010-06-01 | 1 | -11/+5 |
| |/ | |||||
| * | Base options cant live in lazy loaded helpers as they then wont be available ↵ | David Heinemeier Hansson | 2010-05-31 | 2 | -7/+4 |
| | | | | | | | | to set for config | ||||
| * | Unforce i18n from AS | Santiago Pastorino | 2010-05-31 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | rack-test version updated and removed from Gemfile | Santiago Pastorino | 2010-05-31 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Add :only and :except to controllers MiddlewareStack. This allows | José Valim | 2010-05-30 | 3 | -18/+71 |
| | | | | | | | | | | | | | | | | you to do the following: class PostsController < ApplicationController use AutheMiddleware, :except => [:index, :show] end | ||||
* | | Update CHANGELOG | wycats | 2010-05-30 | 1 | -0/+2 |
|/ | |||||
* | Update template to allow handlers to more cleanly handle encodings (ht: nex3) | wycats | 2010-05-30 | 4 | -69/+78 |
| | |||||
* | Remove the laziness from the middleware stack. | José Valim | 2010-05-29 | 2 | -74/+17 |
| | |||||
* | Now that we always return a proxy from mb_chars, even in 1.9, all Strings ↵ | wycats | 2010-05-29 | 1 | -3/+5 |
| | | | | coming back from AS are UTF-8. | ||||
* | fix translation test in actionpack [#4701 state:commited] | Santiago Pastorino | 2010-05-29 | 1 | -1/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Removing Metal from Rails 3. | wycats | 2010-05-29 | 2 | -30/+0 |
| | | | | | | | | | | | | | | | | | | | | If you have existing Metals, you have a few options: * if your metal behaves like a middleware, add it to the middleware stack via config.middleware.use. You can use methods on the middleware stack to control exactly where it should go * if it behaves like a Rack endpoint, you can link to it in the router. This will result in more optimal routing time, and allows you to remove code in your endpoint that matches specific URLs in favor of the more powerful handling in the router itself. For the future, you can use ActionController::Metal to get a very fast controller with the ability to opt-in to specific controller features without paying the penalty of the full controller stack. Since Rails 3 is closer to Rack, the Metal abstraction is no longer needed. | ||||
* | Merge commit 'mislav/auto_link' | Michael Koziarski | 2010-05-29 | 2 | -30/+61 |
|\ |