aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #15530 from zuhao/refactor_actionpack_reloader_testMatthew Draper2014-06-061-0/+5
|\ | | | | Reset callbacks after test.
| * Reset callbacks after test.Zuhao Wan2014-06-051-0/+5
| | | | | | | | Otherwise the state of callback chain is leaked.
* | Merge pull request #15532 from zuhao/refactor_actionpack_response_testYves Senn2014-06-051-2/+4
|\ \ | | | | | | Restore Response.default_headers after test.
| * | 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
|\ \ | |/ |/| Make sure Mime::Type is not altered after tests.
| * 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
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: For our build, stick with mail 2.5.x for now Correct result, previously showing wrong result Collapse PG default extractoin of most types to single regex Change wording of explanation about precision & scale of decimal numbers [ci skip] Cleaned up duplicated CHANGELOG entry [ci skip] reuse available belongs_to? method Convert StrongParameters cache to a hash. This fixes an unbounded memory leak demonstrated on @tenderlove's latest blog post: Partially revert deprecation of *_filter Pluralize params Add default_i18n_subject to the guides Fix regression on eager loading association based on SQL query rather than existing column. Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4 Keep column defaults in type cast form Return a null column when no column exists for an attribute Refactor XML serializer to not depend on `serialized_attributes` Test the serialized types of virtual columns in XML implement ActiveRecord::Base#pretty_print + changelog Remove duplicated HashWithIndifferentAccess#with_indifferent_access.
| * Merge pull request #15498 from zenspider/fix_memory_leakGuillermo Iguaran2014-06-032-7/+7
| |\ | | | | | | Convert StrongParameters cache to a hash. This fixes an unbounded memory leak
| | * Convert StrongParameters cache to a hash. This fixes an unboundedRyan Davis2014-06-032-7/+7
| | | | | | | | | | | | | | | | | | memory leak demonstrated on @tenderlove's latest blog post: http://tenderlovemaking.com/2014/06/02/yagni-methods-are-killing-me.html
| * | Partially revert deprecation of *_filterRafael Mendonça França2014-06-033-36/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are going to deprecate only on Rails 5 to make easier plugin maintainers support different Rails versions. Right now we are only discouraging their usage. This reverts commit 6c5f43bab8206747a8591435b2aa0ff7051ad3de. Conflicts: actionpack/CHANGELOG.md
| * | Merge pull request #15349 from tgxworld/remove_duplicated_method_callRafael Mendonça França2014-06-033-7/+3
| |\ \ | | | | | | | | Remove duplicated HashWithIndifferentAccess#with_indifferent_access.
| | * | 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
| | | | | | | | | | | | | | | application. Use of a symbol should be replaced with `action: symbol`. Use of a string without a "#" should be replaced with `controller: string`.
* | | 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
| | | | | | | | | | | | | | | this lets us reduce is_a checks on the options_constraints and push "callable constraints" verification to the right place.
* | | 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
| | |
* | | :on is removed from options before the Mapping is instantiated, so remove it ↵Aaron Patterson2014-06-031-1/+1
| | | | | | | | | | | | from IGNORE_OPTIONS
* | | pull up via extraction and remove it from options / IGNORE_OPTIONSAaron Patterson2014-06-031-8/+6
| | |
* | | always make :via a listAaron Patterson2014-06-031-3/+2
| | |
* | | always pull out a via variable and simplify logicAaron Patterson2014-06-031-12/+15
| | |
* | | test with an empty viaAaron Patterson2014-06-031-0/+8
| | |
* | | add a test for missing "via" parameterAaron Patterson2014-06-032-1/+9
| | |
* | | remove :as and :anchor from IGNORE_OPTIONSAaron Patterson2014-06-031-3/+5
| | |
* | | remove another value from IGNORE_OPTIONSAaron Patterson2014-06-031-2/+2
| | |
* | | shorten up IGNORE_OPTIONSAaron Patterson2014-06-031-2/+2
| | | | | | | | | | | | | | | | | | since we are now passing the format value around, we can remove it from the options hash, which means we don't need to consult as many values from IGNORE_OPTIONS
* | | only look up the format option from the hash onceAaron Patterson2014-06-031-16/+18
| | |
* | | Feature requests should be made on the mailing list, not submitted toZachary Scott2014-06-011-1/+6
| | | | | | | | | | | | the issue tracker. See also #15455 [ci skip]