Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 7 | -9/+9 | |
| | | | | | | | | not "ActiveRecord" | |||||
* | | truncate safe method description changes | Neeraj Singh | 2010-06-14 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-06-14 | 6 | -12/+20 | |
|\ \ | ||||||
| * | | render(:inline) in a layout before yield replaces original content | Neeraj Singh | 2010-06-13 | 3 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | Bump rack-mount version to 0.6.4 | Santiago Pastorino | 2010-06-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | removes spurious .rb in require | Xavier Noria | 2010-06-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Change sanitize to escape in test names of text_helper_test [#4844 ↵ | rohit | 2010-06-12 | 1 | -9/+9 | |
| | | | | | | | | | | | | state:resolved] | |||||
* | | | truncate documentation an examples added for :safe option | Santiago Pastorino | 2010-06-13 | 1 | -0/+10 | |
|/ / | ||||||
* | | Merge remote branch 'docrails/master' | Xavier Noria | 2010-06-12 | 1 | -1/+9 | |
|\ \ | ||||||
| * | | adds missing require for having ActiveSupport::InheritableOptions defined | Xavier Noria | 2010-06-11 | 1 | -0/+1 | |
| | | | ||||||
| * | | Updated all number helpers with :locale option. | Slobodan Kovacevic | 2010-06-11 | 1 | -1/+9 | |
| |/ | ||||||
* | | Ruby 1.9.1 compat: constant lookup | Jeremy Kemper | 2010-06-11 | 1 | -1/+1 | |
| | | ||||||
* | | text_helper now escape the unsafe input instead of sanitizing | Santiago Pastorino | 2010-06-11 | 2 | -13/+12 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Added tests for cookies with domain option. | Rizwan Reza | 2010-06-11 | 1 | -0/+22 | |
| | | ||||||
* | | Moved test/controller/cookie_test.rb to test/dispatch/cookies_test.rb | Rizwan Reza | 2010-06-11 | 1 | -2/+2 | |
| | | ||||||
* | | Refactored duplication into a separate method. Dropped class variable. | Rizwan Reza | 2010-06-11 | 1 | -15/+17 | |
| | | ||||||
* | | Adding missing docs to delete cookies with :all which were added that way. | Rizwan Reza | 2010-06-11 | 1 | -1/+2 | |
| | | ||||||
* | | Took out the domain option logic to cookies.rb. | Rizwan Reza | 2010-06-11 | 3 | -22/+32 | |
| | | ||||||
* | | Moved Domain regexp to a constant and added comments. | Rizwan Reza | 2010-06-11 | 1 | -1/+8 | |
| | | ||||||
* | | The previous commit didn't work with complex domains, which is now fixed. | Rizwan Reza | 2010-06-11 | 2 | -9/+9 | |
| | | ||||||
* | | Add support for multi-subdomain session by setting cookie host in session ↵ | Rizwan Reza | 2010-06-11 | 4 | -2/+47 | |
| | | | | | | | | | | | | cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved] This reverts commit 330a89072a493aafef1e07c3558964477f85adf0. | |||||
* | | adds missing require for having ActiveSupport::InheritableOptions defined | Xavier Noria | 2010-06-11 | 1 | -0/+1 | |
|/ | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-10 | 17 | -319/+93 | |
|\ | ||||||
| * | Revert "Add support for multi-subdomain session by setting cookie host in ↵ | José Valim | 2010-06-10 | 4 | -47/+2 | |
| | | | | | | | | | | | | | | | | 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 | 2 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | [#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 | 2 | -31/+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 | 4 | -1/+48 | |
| | | | | | | | | | | | | 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 | 3 | -191/+2 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Better test for ticket [#3914 state:resolved] | Neeraj Singh | 2010-06-09 | 1 | -0/+11 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Add more cases to previous commit [#4394 state:resolved] | José Valim | 2010-06-08 | 2 | -3/+10 | |
| | | ||||||
| * | Make sure namespaces are nested within resources | Jan De Poorter | 2010-06-08 | 2 | -0/+23 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | cache_sweeper yields blank output | Neeraj Singh | 2010-06-08 | 3 | -0/+10 | |
| | | | | | | | | | | | | [#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 | 3 | -75/+3 | |
| | | | | | | | | This reverts commit 67a60ee314f53abcde78f8ecd2a1f7c9ef8264e1. | |||||
| * | Memoize the object returned by _view in ActionView::TestCase::Behavior | David Chelimsky | 2010-06-08 | 2 | -6/+12 | |
| | | | | | | | | | | | | [#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 | 2 | -2/+2 | |
| | ||||||
* | Fixed double output from cache in no caching mode | David Heinemeier Hansson | 2010-06-08 | 2 | -29/+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 | 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] |