aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Support render_template in view tests. Useful for specifying whichDavid Chelimsky2010-06-202-0/+9
* Don't use module to work out shallow name prefix and path as it may not accur...Andrew White2010-06-202-10/+33
* Make polymorphic_url and scaffolding work with uncountable resources [#3930 s...Andrew White2010-06-204-6/+35
* Accept an object for :constraints option [#4904 state:resolved]Andrew White2010-06-202-1/+9
* Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-206-32/+105
|\
| * option_groups_from_collection_for_select should return HTML-safe string [#487...Wincent Colaiuta2010-06-192-19/+13
| * Remove a relic of #request being in RackDelegationwycats2010-06-192-6/+9
| * Custom resource routes should be scopedAndrew White2010-06-192-7/+83
* | 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
* fix for :shallow in router not generating helpers for create, update, and des...Josh Kalderimis2010-06-182-5/+42
* 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 sa...Santiago Pastorino2010-06-172-46/+42
* Add shallow routing option to new router [#3765 status:committed]Andrew White2010-06-173-156/+383
* excerpt shoudn't return safe output test addedSantiago Pastorino2010-06-171-0/+4
* truncate() should not try to produce HTML-safe outputWincent Colaiuta2010-06-172-22/+8
* 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", n...Xavier Noria2010-06-147-9/+9
* 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
| * 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 state:reso...rohit2010-06-121-9/+9
* | 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
* | 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 coo...Rizwan Reza2010-06-114-2/+47
* | 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 ses...José Valim2010-06-104-47/+2
| * Missing method error doesn't specify which controller it is missing from [#44...Alan Harper2010-06-102-2/+11
| * 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
| * Add support for multi-subdomain session by setting cookie host in session coo...Guillermo Álvarez2010-06-104-1/+48
| * 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
| * Better test for ticket [#3914 state:resolved]Neeraj Singh2010-06-091-0/+11
| * Add more cases to previous commit [#4394 state:resolved]José Valim2010-06-082-3/+10