Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-10 | 9 | -137/+34 |
|\ | |||||
| * | Revert "Add support for multi-subdomain session by setting cookie host in ↵ | José Valim | 2010-06-10 | 2 | -14/+1 |
| | | | | | | | | | | | | | | | | session cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved]" It does not work for domains like co.uk and com.br. This reverts commit c4d6245e875bbb276c122a5a401422d341dac4df. | ||||
| * | Missing method error doesn't specify which controller it is missing from ↵ | Alan Harper | 2010-06-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | [#4436 state:resolved] The error page shown when the method you are requesting on a controller doesn't specify which controller the method is missing from Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Remove punctuate_body! No code in lib was using it and it had no documentation. | José Valim | 2010-06-10 | 1 | -6/+0 |
| | | |||||
| * | class_attribute is not a direct replacement of class_inheritable_*. | José Valim | 2010-06-10 | 3 | -14/+12 |
| | | | | | | | | | | | | If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance. | ||||
| * | Add support for multi-subdomain session by setting cookie host in session ↵ | Guillermo Álvarez | 2010-06-10 | 2 | -1/+14 |
| | | | | | | | | | | | | cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Ensure show exceptions middleware properly filters backtrace before logging. | José Valim | 2010-06-09 | 1 | -1/+1 |
| | | |||||
| * | Removed textilize, textilize_without_paragraph and markdown helpers | Santiago Pastorino | 2010-06-09 | 1 | -83/+0 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Add more cases to previous commit [#4394 state:resolved] | José Valim | 2010-06-08 | 1 | -1/+1 |
| | | |||||
| * | Make sure namespaces are nested within resources | Jan De Poorter | 2010-06-08 | 1 | -0/+8 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | cache_sweeper yields blank output | Neeraj Singh | 2010-06-08 | 1 | -0/+1 |
| | | | | | | | | | | | | [#3914 state:open] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Revert "Add shallow routes to the new router" for now. Needs more work. | David Heinemeier Hansson | 2010-06-08 | 1 | -26/+3 |
| | | | | | | | | This reverts commit 67a60ee314f53abcde78f8ecd2a1f7c9ef8264e1. | ||||
| * | Memoize the object returned by _view in ActionView::TestCase::Behavior | David Chelimsky | 2010-06-08 | 1 | -6/+8 |
| | | | | | | | | | | | | [#4799 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Added :locale option explanation for number_to_currency | Slobodan Kovacevic | 2010-06-10 | 1 | -0/+2 |
|/ | |||||
* | Get ready for beta 4 | David Heinemeier Hansson | 2010-06-08 | 1 | -1/+1 |
| | |||||
* | Fixed double output from cache in no caching mode | David Heinemeier Hansson | 2010-06-08 | 1 | -14/+14 |
| | |||||
* | 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 | 1 | -2/+2 |
| | | | | | | 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 | 1 | -0/+2 |
| | | | | 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 | 1 | -2/+2 |
| | | | | | | | | 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 | 1 | -27/+70 |
| | | | | | | 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 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-06-08 | 1 | -3/+26 |
|\ | |||||
| * | Add shallow routes to the new router [Closes #3765] | Diego Carrion | 2010-06-07 | 1 | -3/+26 |
| | | |||||
* | | Updating image_tag to support cid:content_id "URLs" | Mikel Lindsaar | 2010-06-07 | 1 | -2/+5 |
|/ | |||||
* | 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 | 1 | -1/+1 |
| | | | | state:resolved] | ||||
* | Makes text_helper methods sanitize the input if the input is not safe or ↵ | Santiago Pastorino | 2010-06-07 | 1 | -16/+22 |
| | | | | :safe => true option is not provided | ||||
* | content_tag_string shouldn't escape_html if escape param is false | Santiago Pastorino | 2010-06-07 | 1 | -1/+1 |
| | |||||
* | 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 | 1 | -3/+1 |
| | |||||
* | Make AP test suite green once again and speed up performance in layouts ↵ | José Valim | 2010-06-07 | 3 | -31/+37 |
| | | | | lookup for some cases. | ||||
* | Router accepts member routes on resource. [#4624 state:resolved] | Rizwan Reza | 2010-06-06 | 1 | -5/+14 |
| | |||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | revises the documentation of String#truncate and the truncate helper | Xavier Noria | 2010-06-02 | 1 | -9/+9 |
| | |||||
* | Extracted String#truncate from TextHelper#truncate [DHH] | David Heinemeier Hansson | 2010-06-01 | 1 | -11/+5 |
| |