aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Prevent conflict between mime types and Object methodsMircea Pricop2012-07-062-1/+16
* Revert "push parameter instantiation to one method"Aaron Patterson2012-07-051-1/+1
* Merge branch 'master' into testcleanAaron Patterson2012-07-051-2/+7
|\
| * Add the options method to action_controller testcase.François de Metz2012-07-041-2/+7
* | push parameter instantiation to one methodAaron Patterson2012-07-031-1/+1
* | add Mime.fetch so we can have default mime typesAaron Patterson2012-07-032-2/+6
* | make the default environment have actual defaultsAaron Patterson2012-07-032-3/+16
* | assing the request on the response only onceAaron Patterson2012-07-031-4/+5
* | group things that are alikeAaron Patterson2012-07-032-10/+10
* | push functional test specific methods to it's own moduleAaron Patterson2012-07-032-9/+15
* | test should be testing to_param not to_s, remove Array subclassAaron Patterson2012-07-031-5/+1
* | push the cookie writing stuff out of the controllerAaron Patterson2012-07-032-23/+8
* | extend the controller with special logic on recycleAaron Patterson2012-07-032-16/+28
* | push req / res setting to the test runnerAaron Patterson2012-07-032-5/+10
* | extract response setting to a methodAaron Patterson2012-07-031-2/+8
|/
* push response creation down since third param is never used.Aaron Patterson2012-07-021-3/+3
* 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
| |/ |/|