aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-apCarlos Antonio da Silva2012-06-304-23/+32
|\
| * Remove ActiveModel dependency from ActionPackGuillermo Iguaran2012-06-304-23/+32
* | Merge pull request #6908 from apotonick/av-prepare2José Valim2012-06-302-20/+13
|\ \
| * | removing the AV::Base.helpers class attribute as it is not needed.Nick Sutterer2012-06-291-1/+0
| * | remove AV.prepare and move all helper-related logic into the controller. this...Nick Sutterer2012-06-292-19/+13
| |/
* / Revert "Allow loading external route files from the router"José Valim2012-06-292-19/+0
|/
* Merge pull request #6859 from bogdan/deprecate_monkey_patchJosé Valim2012-06-261-0/+6
|\
| * AS::Callbacks: deprecate monkey patch codeBogdan Gusiev2012-06-261-0/+6
* | :update_details method no more exists on @lookup_contextAkira Matsuda2012-06-261-2/+1
|/
* Do not propagate the :raise option to AS number helpersCarlos Antonio da Silva2012-06-241-7/+19
* Merge pull request #6805 from tim-vandecasteele/uploadedfile-paramifyCarlos Antonio da Silva2012-06-231-1/+1
|\
| * Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-06-221-1/+1
* | eliminating another string subclassAaron Patterson2012-06-221-3/+7
* | fix some accidental nilsAaron Patterson2012-06-222-3/+3
* | add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-221-1/+1
* | 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-211-19/+76
|\ \ \
| * | | 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-211-19/+50
* | | | stop subclassing stringAaron Patterson2012-06-211-3/+10
| |_|/ |/| |
* | | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTagFrancesco Rodriguez2012-06-193-4/+4
* | | Ensure that cache-control headers are mergedJames Tucker2012-06-181-10/+32
* | | Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-161-1/+7
|\ \ \
| * | | Respect absolute paths in compute_source_path.Steve Klabnik2012-06-161-1/+7
* | | | 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-162-1/+8
|/ / /
* | | 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
* | | Revert "AV::TestCase does not need to be loaded when eagerly loading the"Aaron Patterson2012-06-141-2/+1
| |/ |/|
* | 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