aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_testYves Senn2014-06-081-1/+4
|\
| * Restore test deliveries for ActionMailer.Zuhao Wan2014-06-071-1/+4
* | Handle client disconnect during live streamingMatthew Draper2014-06-084-13/+189
* | adds some details to the rationale of converted_arrays [ci skip]Xavier Noria2014-06-072-1/+5
* | adds a regression test for the strong params converted arrays cacheXavier Noria2014-06-071-1/+18
* | Revert "Convert StrongParameters cache to a hash. This fixes an unbounded"Xavier Noria2014-06-072-7/+7
* | [ci skip] Fix capitalizationAkshay Vishnoi2014-06-072-3/+3
* | remove another wasteful AS::SafeBuffer allocationAaron Patterson2014-06-061-1/+1
* | eliminate wasteful AS::SafeBuffer allocationAaron Patterson2014-06-061-1/+1
|/
* Use a frozen Set instance for CGI_VARIABLES.Nathaniel Bibler2014-06-051-8/+21
* Avoid misuse of underscore argumentCorey Ward2014-06-051-2/+2
* Merge pull request #15530 from zuhao/refactor_actionpack_reloader_testMatthew Draper2014-06-061-0/+5
|\
| * Reset callbacks after test.Zuhao Wan2014-06-051-0/+5
* | Merge pull request #15532 from zuhao/refactor_actionpack_response_testYves Senn2014-06-051-2/+4
|\ \
| * | Restore Response.default_headers after test.Zuhao Wan2014-06-051-2/+4
* | | Avoid hard-coded value in test setup/teardown.Zuhao Wan2014-06-051-1/+2
|/ /
* | Merge pull request #15529 from zuhao/refactor_actionpack_mime_type_testYves Senn2014-06-052-8/+0
|\ \ | |/ |/|
| * Mime::PNG is already defined.Zuhao Wan2014-06-052-8/+0
* | Avoid hardcoded value in test setup/teardown.Zuhao Wan2014-06-051-1/+2
|/
* Merge branch 'master' of github.com:rails/railsAaron Patterson2014-06-048-50/+19
|\
| * Merge pull request #15498 from zenspider/fix_memory_leakGuillermo Iguaran2014-06-032-7/+7
| |\
| | * Convert StrongParameters cache to a hash. This fixes an unboundedRyan Davis2014-06-032-7/+7
| * | Partially revert deprecation of *_filterRafael Mendonça França2014-06-033-36/+9
| * | Merge pull request #15349 from tgxworld/remove_duplicated_method_callRafael Mendonça França2014-06-033-7/+3
| |\ \
| | * | Remove duplicated HashWithIndifferentAccess#with_indifferent_access.Guo Xiang Tan2014-05-263-7/+3
* | | | push splitting "to" up the callstackAaron Patterson2014-06-031-15/+20
|/ / /
* | | oops! :bomb:Aaron Patterson2014-06-032-92/+0
* | | Routes specifying 'to:' must be a string that contains a "#" or a rackAaron Patterson2014-06-036-27/+149
* | | use the factory method to construct the mappingAaron Patterson2014-06-031-1/+1
* | | add tests for mixing :to and controller / actionAaron Patterson2014-06-031-0/+48
* | | push some options munging to an alternate constructorAaron Patterson2014-06-031-13/+19
* | | add tests for nested lambda constraintsAaron Patterson2014-06-031-0/+27
* | | move options_constraints tests next to each otherAaron Patterson2014-06-031-2/+2
* | | only do is_a checks on `formatted` onceAaron Patterson2014-06-031-9/+5
* | | push options_constraints processing upAaron Patterson2014-06-031-22/+24
* | | remove options as an ivarAaron Patterson2014-06-031-6/+8
* | | only do Regexp === option onceAaron Patterson2014-06-031-3/+4
* | | return early from add_request_methodAaron Patterson2014-06-031-11/+11
* | | only loop over `options` once (hopefully)Aaron Patterson2014-06-031-13/+11
* | | only loop through constraints onceAaron Patterson2014-06-031-19/+15
* | | change defaults allocation to a one-linerAaron Patterson2014-06-031-3/+2
* | | no longer need the scope ivarAaron Patterson2014-06-031-2/+1
* | | only look up scope[:module] onceAaron Patterson2014-06-031-6/+6
* | | remove IGNORE_OPTIONSAaron Patterson2014-06-031-4/+8
* | | :only is never used in Mapping, so rm the keyAaron Patterson2014-06-031-1/+2
* | | remove :defaults from the IGNORE_OPTIONS listAaron Patterson2014-06-031-4/+4
* | | remove :constraints from IGNORE_OPTIONSAaron Patterson2014-06-031-4/+5
* | | disconnect normalize_defaults! from options[:constraints]Aaron Patterson2014-06-031-6/+6
* | | disconnect options and scope from the `blocks` methodAaron Patterson2014-06-031-7/+8
* | | disconnect the constraints method from the options and scope hashesAaron Patterson2014-06-031-12/+15