aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* remove executable permission from files that don't need it. [#4802 ↵rohit2010-06-201-0/+0
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Support render_template in view tests. Useful for specifying whichDavid Chelimsky2010-06-202-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 White2010-06-202-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 White2010-06-204-6/+35
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Accept an object for :constraints option [#4904 state:resolved]Andrew White2010-06-202-1/+9
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-206-32/+105
|\
| * option_groups_from_collection_for_select should return HTML-safe string ↵Wincent Colaiuta2010-06-192-19/+13
| | | | | | | | | | | | [#4879 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com>
| * Remove a relic of #request being in RackDelegationwycats2010-06-192-6/+9
| |
| * Custom resource routes should be scopedAndrew White2010-06-192-7/+83
| | | | | | | | | | | | [#3765] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Clear DescendantsTracker on each request.José Valim2010-06-191-4/+4
| |
* | ActiveRecord and ActionPack now use the new descendants implementation.José Valim2010-06-191-11/+2
|/
* form_for without :html and with :remote should not errorDavid Genord II2010-06-182-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 Kalderimis2010-06-182-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 Kemper2010-06-171-1/+1
|
* Make text_helpers methods which return valid html to return it as safe and ↵Santiago Pastorino2010-06-172-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 White2010-06-173-156/+383
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* excerpt shoudn't return safe output test addedSantiago Pastorino2010-06-171-0/+4
| | | | | | [#4878] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* truncate() should not try to produce HTML-safe outputWincent Colaiuta2010-06-172-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 componentsXavier Noria2010-06-161-1/+2
|
* edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-147-9/+9
| | | | not "ActiveRecord"
* truncate safe method description changesNeeraj Singh2010-06-141-1/+1
|
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-06-146-12/+20
|\
| * render(:inline) in a layout before yield replaces original contentNeeraj Singh2010-06-133-1/+9
| | | | | | | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Bump rack-mount version to 0.6.4Santiago Pastorino2010-06-121-1/+1
| |
| * removes spurious .rb in requireXavier Noria2010-06-121-1/+1
| |
| * Change sanitize to escape in test names of text_helper_test [#4844 ↵rohit2010-06-121-9/+9
| | | | | | | | state:resolved]
* | truncate documentation an examples added for :safe optionSantiago Pastorino2010-06-131-0/+10
|/
* Merge remote branch 'docrails/master'Xavier Noria2010-06-121-1/+9
|\
| * adds missing require for having ActiveSupport::InheritableOptions definedXavier Noria2010-06-111-0/+1
| |
| * Updated all number helpers with :locale option.Slobodan Kovacevic2010-06-111-1/+9
| |
* | Ruby 1.9.1 compat: constant lookupJeremy Kemper2010-06-111-1/+1
| |
* | text_helper now escape the unsafe input instead of sanitizingSantiago Pastorino2010-06-112-13/+12
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Added tests for cookies with domain option.Rizwan Reza2010-06-111-0/+22
| |
* | Moved test/controller/cookie_test.rb to test/dispatch/cookies_test.rbRizwan Reza2010-06-111-2/+2
| |
* | Refactored duplication into a separate method. Dropped class variable.Rizwan Reza2010-06-111-15/+17
| |
* | Adding missing docs to delete cookies with :all which were added that way.Rizwan Reza2010-06-111-1/+2
| |
* | Took out the domain option logic to cookies.rb.Rizwan Reza2010-06-113-22/+32
| |
* | Moved Domain regexp to a constant and added comments.Rizwan Reza2010-06-111-1/+8
| |
* | The previous commit didn't work with complex domains, which is now fixed.Rizwan Reza2010-06-112-9/+9
| |
* | Add support for multi-subdomain session by setting cookie host in session ↵Rizwan Reza2010-06-114-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 definedXavier Noria2010-06-111-0/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-06-1017-319/+93
|\
| * Revert "Add support for multi-subdomain session by setting cookie host in ↵José Valim2010-06-104-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 Harper2010-06-102-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é Valim2010-06-102-31/+0
| |
| * class_attribute is not a direct replacement of class_inheritable_*.José Valim2010-06-103-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 Álvarez2010-06-104-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é Valim2010-06-091-1/+1
| |
| * Removed textilize, textilize_without_paragraph and markdown helpersSantiago Pastorino2010-06-093-191/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Better test for ticket [#3914 state:resolved]Neeraj Singh2010-06-091-0/+11
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>