aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-222-1/+2
|\
| * fixes a few mistakes in api docs [ci skip]Vijay Dev2012-06-221-1/+1
| * Fix misprint in UrlHelper moduleAlexey Vakhov2012-06-181-1/+1
| * Add rdoc to phone_field Gaurish Sharma2012-06-161-0/+1
* | use mutex_m rather than use a delegate systemAaron Patterson2012-06-211-6/+3
* | Merge pull request #6428 from pinetops/resolver_concurrency_fixYehuda Katz2012-06-212-23/+80
|\ \
| * | Improve the readability of the Resolver change detection codeTom Clarke2012-05-221-11/+19
| * | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| * | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-212-23/+54
* | | stop subclassing stringAaron Patterson2012-06-212-4/+11
* | | Removed warnings.Arun Agrawal2012-06-211-3/+3
* | | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTagFrancesco Rodriguez2012-06-193-4/+4
* | | Merge pull request #6777 from route/logger_in_metal_testsCarlos Antonio da Silva2012-06-191-0/+17
|\ \ \
| * | | Added test for case when view doesn't have logger method when using ActionCon...Dmitry Vorotilin2012-06-191-0/+17
* | | | Ensure that cache-control headers are mergedJames Tucker2012-06-182-10/+44
|/ / /
* | | Bump tzinfo gem.kennyj2012-06-171-1/+1
* | | Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-163-4/+21
|\ \ \
| * | | Respect absolute paths in compute_source_path.Steve Klabnik2012-06-163-4/+21
* | | | TestCase does not need to be loaded when loading the frameworkAaron Patterson2012-06-151-1/+3
* | | | Support unicode character route in config/routes.rb.kennyj2012-06-165-3/+25
|/ / /
* | | Use status, content_type, body method signature for render tooSantiago Pastorino2012-06-141-4/+3
* | | Refactor public exceptions to reuse render format methodCarlos Antonio da Silva2012-06-141-9/+6
* | | adding a test for #6459Aaron Patterson2012-06-141-0/+10
* | | Revert "AV::TestCase does not need to be loaded when eagerly loading the"Aaron Patterson2012-06-141-2/+1
* | | we raise a subclass of LoadError, so rescue thatAaron Patterson2012-06-141-1/+6
| |/ |/|
* | 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
* | | Fix buildSantiago Pastorino2012-06-131-2/+2
* | | 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-132-0/+35
|/ / /
* | | Merge branch 'master-sec'Aaron Patterson2012-06-122-2/+8
|\ \ \
| * | | Array parameters should not contain nil values.Aaron Patterson2012-06-122-2/+8
* | | | content_type is already a Mime::Type objectSantiago Pastorino2012-06-121-1/+1
* | | | This consider_all_requests_local doesn't make senseSantiago Pastorino2012-06-122-21/+2
|/ / /
* | | Return proper format on exceptionsSantiago Pastorino2012-06-113-14/+81
* | | both string and sumbol will be interpolated as string no need to convert to_sganesh2012-06-112-8/+8
* | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-062-4/+4
* | | stop `to_s`ing method namesAkira Matsuda2012-06-061-16/+16
* | | fix meaningless test caseAkira Matsuda2012-06-061-1/+1
* | | One-liner code for logger in ActionView::Helpers::ControllerHelperDmitry Vorotilin2012-06-051-5/+1