aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'rails/master'Xavier Noria2010-06-2028-281/+727
|\
| * 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 tr...Thibaud Guillaume-Gentil2010-06-202-2/+31
| * Adding missing test to autolink with other protocols (file) [#4886 state:reso...Carlos Antonio da Silva2010-06-201-0/+1
| * Make sure a namespaced <%= render form %> still renders the _form partial [#4...Jan De Poorter2010-06-203-1/+13
| * Use Rack::Utils.bytesize when calculating content-length of exception pages. ...Tarsoly András2010-06-201-1/+1
| * remove executable permission from files that don't need it. [#4802 state:reso...rohit2010-06-201-0/+0
| * 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
* | 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", 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