aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-142-8/+26
|\
| * moar copy edits [ci skip]Vijay Dev2012-06-141-2/+1
| * copy editing [ci skip]Vijay Dev2012-06-141-4/+7
| * fixed http token authentication formattingJakub Kuźma2012-06-121-8/+13
| * on CSRF whitelisting the argument for :if must be a symbolDaniel Lopes2012-06-071-1/+1
| * fix typos on the CSRF whitelisting docDaniel Lopes2012-06-071-3/+3
| * Document the CSRF whitelisting on get requestsDaniel Lopes2012-06-071-5/+16
* | AV::TestCase does not need to be loaded when eagerly loading theAaron Patterson2012-06-141-1/+2
* | i suck, fixing error messageAaron Patterson2012-06-141-1/+1
* | Wrap up missing helper exceptionsAaron Patterson2012-06-141-2/+10
* | using hax to fix tests on Ruby 2.0Aaron Patterson2012-06-131-1/+6
* | Merge pull request #6721 from homakov/patch-2Santiago Pastorino2012-06-131-3/+0
|\ \
| * | These lines don't help to mitigate CVE. They only turn [nil] into nil, w/o th...Egor Homakov2012-06-131-3/+0
* | | ActionController::Caching depends on RackDelegation and AbstractController::C...Santiago Pastorino2012-06-131-0/+3
|/ /
* | Merge branch 'master-sec'Aaron Patterson2012-06-121-2/+4
|\ \
| * | Array parameters should not contain nil values.Aaron Patterson2012-06-121-2/+4
* | | content_type is already a Mime::Type objectSantiago Pastorino2012-06-121-1/+1
* | | This consider_all_requests_local doesn't make senseSantiago Pastorino2012-06-121-3/+2
|/ /
* | Return proper format on exceptionsSantiago Pastorino2012-06-111-14/+36
* | both string and sumbol will be interpolated as string no need to convert to_sganesh2012-06-111-3/+3
* | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-062-4/+4
* | One-liner code for logger in ActionView::Helpers::ControllerHelperDmitry Vorotilin2012-06-051-5/+1
* | Merge pull request #6631 from yuki24/use_block_in_button_helperJosé Valim2012-06-051-2/+13
|\ \
| * | accept a block in button helper.Yuki Nishijima2012-06-051-2/+13
| |/
* / Metal controller doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-051-2/+8
|/
* Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-011-1/+2
* Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-011-1/+7
* Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-012-3/+6
* Merge branch 'master-sec'Aaron Patterson2012-05-311-0/+22
|\
| * Strip [nil] from parameters hash.Aaron Patterson2012-05-301-0/+22
| * Fix the buildSantiago Pastorino2012-05-221-1/+0
| * require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
* | Extracted redirect logic from ActionController::Force::ClassMethods.force_sslJeremy Friesen2012-05-311-7/+15
* | Simplify link_to using content_tagCarlos Antonio da Silva2012-05-311-12/+6
* | Make link_to arguments explicitCarlos Antonio da Silva2012-05-311-8/+4
* | Make button_to arguments explicit and refactor a bitCarlos Antonio da Silva2012-05-311-10/+6
* | Simplify logic to initialize valid conditions in RouteSetCarlos Antonio da Silva2012-05-311-7/+3
* | accept a block in button_to helperSergey Nartimov2012-05-301-3/+28
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-301-1/+1
|\ \
| * | fix typo in render_template [ci skip]Brent Vatne2012-05-291-1/+1
* | | Review requires from number helperCarlos Antonio da Silva2012-05-281-4/+1
* | | Parse float value only once in number helpersCarlos Antonio da Silva2012-05-281-11/+11
* | | Merge pull request #6315 from appfolio/moving_number_helper_methods_to_active...José Valim2012-05-282-285/+38
|\ \ \
| * | | Moving NumberHelpers from ActionView to ActiveSupportAndrew Mutz2012-05-272-285/+38
| |/ /
* / / Fix sorting of helpers from different pathsPiotr Sarnacki2012-05-281-2/+2
|/ /
* | Add `:escape` option for `truncate`Rafael Mendonça França2012-05-261-2/+5
* | Update the documentation and add CHANGELOG entryRafael Mendonça França2012-05-261-3/+3
* | Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-261-13/+12
* | Truncate now has the ability to receive a html option that allows it to call ...Li Ellis Gallardo2012-05-261-2/+12
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-4/+3
|\ \