aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* adds minus to value part of id [#4862 state:resolved]RainerBlessing2010-06-221-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* test for #4862Neeraj Singh2010-06-221-0/+5
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add support for specifying locals in view tests with assert template [#4927 ↵David Chelimsky2010-06-223-5/+44
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Ensure overwritten callbacks conditions in controllers work [#4761 ↵José Valim2010-06-221-2/+12
| | | | state:resolved] [#3913 state:resolved]
* Bump rack-mount to 0.6.5 for tokenizer speedupJeremy Kemper2010-06-211-1/+1
|
* removed 'unless const_defined?' code smellJosh Kalderimis2010-06-216-47/+39
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-06-2028-281/+727
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader.José Valim2010-06-201-1/+1
| |
| * Fixed date_select date_separator when discard_month and/or discard_day are ↵Thibaud Guillaume-Gentil2010-06-202-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 Silva2010-06-201-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 Poorter2010-06-203-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ás2010-06-201-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 ↵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
| |
* | Take out documentation from DeprecatedMapper to discourage its usage.Rizwan Reza2010-06-211-384/+0
| |
* | Use h1 for titles.Rizwan Reza2010-06-211-1/+1
| |
* | Final touches and fixes.Rizwan Reza2010-06-217-1/+9
| |
* | Action View is now titled.Rizwan Reza2010-06-211-1/+1
| |
* | Action View is now titled.Rizwan Reza2010-06-213-0/+5
| |
* | Update integrated logging formatPaco Guzman2010-06-201-9/+9
| |
* | Added title to some other files in actionpack/lib/action_viewRizwan Reza2010-06-167-0/+9
| |
* | Added titles and description.Rizwan Reza2010-06-167-17/+37
| |
* | Adds title and description where needed.Rizwan Reza2010-06-1615-22/+48
| |
* | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-1516-23/+23
|\ \ | |/ |/|
| * Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-1116-23/+23
| |
* | 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
|/ /