Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader. | José Valim | 2010-06-20 | 1 | -1/+1 |
| | |||||
* | Fixed date_select date_separator when discard_month and/or discard_day are ↵ | Thibaud Guillaume-Gentil | 2010-06-20 | 2 | -2/+31 |
| | | | | | | true [#4856 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Adding missing test to autolink with other protocols (file) [#4886 ↵ | Carlos Antonio da Silva | 2010-06-20 | 1 | -0/+1 |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Make sure a namespaced <%= render form %> still renders the _form partial ↵ | Jan De Poorter | 2010-06-20 | 3 | -1/+13 |
| | | | | | | [#4784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Use Rack::Utils.bytesize when calculating content-length of exception pages. ↵ | Tarsoly András | 2010-06-20 | 1 | -1/+1 |
| | | | | | | [#4727 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 1 | -0/+0 |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Support render_template in view tests. Useful for specifying which | David Chelimsky | 2010-06-20 | 2 | -0/+9 |
| | | | | | | | | partials are rendered under different conditions. [#4903 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Don't use module to work out shallow name prefix and path as it may not ↵ | Andrew White | 2010-06-20 | 2 | -10/+33 |
| | | | | | | accurately reflect the actual namespace [#4899 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Make polymorphic_url and scaffolding work with uncountable resources [#3930 ↵ | Andrew White | 2010-06-20 | 4 | -6/+35 |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Accept an object for :constraints option [#4904 state:resolved] | Andrew White | 2010-06-20 | 2 | -1/+9 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-20 | 6 | -32/+105 |
|\ | |||||
| * | option_groups_from_collection_for_select should return HTML-safe string ↵ | Wincent Colaiuta | 2010-06-19 | 2 | -19/+13 |
| | | | | | | | | | | | | [#4879 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
| * | Remove a relic of #request being in RackDelegation | wycats | 2010-06-19 | 2 | -6/+9 |
| | | |||||
| * | Custom resource routes should be scoped | Andrew White | 2010-06-19 | 2 | -7/+83 |
| | | | | | | | | | | | | [#3765] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Clear DescendantsTracker on each request. | José Valim | 2010-06-19 | 1 | -4/+4 |
| | | |||||
* | | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 1 | -11/+2 |
|/ | |||||
* | form_for without :html and with :remote should not error | David Genord II | 2010-06-18 | 2 | -1/+21 |
| | | | | | | [#4902 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | fix for :shallow in router not generating helpers for create, update, and ↵ | Josh Kalderimis | 2010-06-18 | 2 | -5/+42 |
| | | | | | | | | destroy actions when :only or :except are used [#4900 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Credit for the heavy lifting! | Jeremy Kemper | 2010-06-17 | 1 | -1/+1 |
| | |||||
* | Make text_helpers methods which return valid html to return it as safe and ↵ | Santiago Pastorino | 2010-06-17 | 2 | -46/+42 |
| | | | | | | | | sanitize the input always unless :sanitize => false is set [#4825 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Add shallow routing option to new router [#3765 status:committed] | Andrew White | 2010-06-17 | 3 | -156/+383 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | excerpt shoudn't return safe output test added | Santiago Pastorino | 2010-06-17 | 1 | -0/+4 |
| | | | | | | [#4878] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | truncate() should not try to produce HTML-safe output | Wincent Colaiuta | 2010-06-17 | 2 | -22/+8 |
| | | | | | | | | | | As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate() method cannot guarantee safe output for all possible inputs/offsets, so it is best to leave the output unsafe so that it gets escaped when used in a view. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | use RDoc 2.2 to generate the documentation of individual components | Xavier Noria | 2010-06-16 | 1 | -1/+2 |
| | |||||
* | 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 |
| | |