Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2014-06-04 | 4 | -36/+14 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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_leak | Guillermo Iguaran | 2014-06-03 | 1 | -6/+6 | |
| |\ \ | | | | | | | | | Convert StrongParameters cache to a hash. This fixes an unbounded memory leak | |||||
| | * | | Convert StrongParameters cache to a hash. This fixes an unbounded | Ryan Davis | 2014-06-03 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 *_filter | Rafael Mendonça França | 2014-06-03 | 1 | -27/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_call | Rafael Mendonça França | 2014-06-03 | 2 | -3/+2 | |
| |\ \ \ | | | | | | | | | | | Remove duplicated HashWithIndifferentAccess#with_indifferent_access. | |||||
| | * | | | Remove duplicated HashWithIndifferentAccess#with_indifferent_access. | Guo Xiang Tan | 2014-05-26 | 2 | -3/+2 | |
| | | | | | ||||||
* | | | | | push splitting "to" up the callstack | Aaron Patterson | 2014-06-03 | 1 | -15/+20 | |
|/ / / / | ||||||
* | | | | Routes specifying 'to:' must be a string that contains a "#" or a rack | Aaron Patterson | 2014-06-03 | 1 | -3/+21 | |
| | | | | | | | | | | | | | | | | | | | | application. Use of a symbol should be replaced with `action: symbol`. Use of a string without a "#" should be replaced with `controller: string`. | |||||
* | | | | push some options munging to an alternate constructor | Aaron Patterson | 2014-06-03 | 1 | -13/+19 | |
| | | | | ||||||
* | | | | move options_constraints tests next to each other | Aaron Patterson | 2014-06-03 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | only do is_a checks on `formatted` once | Aaron Patterson | 2014-06-03 | 1 | -9/+5 | |
| | | | | ||||||
* | | | | push options_constraints processing up | Aaron Patterson | 2014-06-03 | 1 | -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 ivar | Aaron Patterson | 2014-06-03 | 1 | -6/+8 | |
| | | | | ||||||
* | | | | only do Regexp === option once | Aaron Patterson | 2014-06-03 | 1 | -3/+4 | |
| | | | | ||||||
* | | | | return early from add_request_method | Aaron Patterson | 2014-06-03 | 1 | -11/+11 | |
| | | | | ||||||
* | | | | only loop over `options` once (hopefully) | Aaron Patterson | 2014-06-03 | 1 | -13/+11 | |
| | | | | ||||||
* | | | | only loop through constraints once | Aaron Patterson | 2014-06-03 | 1 | -19/+15 | |
| | | | | ||||||
* | | | | change defaults allocation to a one-liner | Aaron Patterson | 2014-06-03 | 1 | -3/+2 | |
| | | | | ||||||
* | | | | no longer need the scope ivar | Aaron Patterson | 2014-06-03 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | only look up scope[:module] once | Aaron Patterson | 2014-06-03 | 1 | -6/+6 | |
| | | | | ||||||
* | | | | remove IGNORE_OPTIONS | Aaron Patterson | 2014-06-03 | 1 | -4/+8 | |
| | | | | ||||||
* | | | | :only is never used in Mapping, so rm the key | Aaron Patterson | 2014-06-03 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | remove :defaults from the IGNORE_OPTIONS list | Aaron Patterson | 2014-06-03 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | remove :constraints from IGNORE_OPTIONS | Aaron Patterson | 2014-06-03 | 1 | -4/+5 | |
| | | | | ||||||
* | | | | disconnect normalize_defaults! from options[:constraints] | Aaron Patterson | 2014-06-03 | 1 | -6/+6 | |
| | | | | ||||||
* | | | | disconnect options and scope from the `blocks` method | Aaron Patterson | 2014-06-03 | 1 | -7/+8 | |
| | | | | ||||||
* | | | | disconnect the constraints method from the options and scope hashes | Aaron Patterson | 2014-06-03 | 1 | -12/+15 | |
| | | | | ||||||
* | | | | :on is removed from options before the Mapping is instantiated, so remove it ↵ | Aaron Patterson | 2014-06-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | from IGNORE_OPTIONS | |||||
* | | | | pull up via extraction and remove it from options / IGNORE_OPTIONS | Aaron Patterson | 2014-06-03 | 1 | -8/+6 | |
| | | | | ||||||
* | | | | always make :via a list | Aaron Patterson | 2014-06-03 | 1 | -3/+2 | |
| | | | | ||||||
* | | | | always pull out a via variable and simplify logic | Aaron Patterson | 2014-06-03 | 1 | -12/+15 | |
| | | | | ||||||
* | | | | add a test for missing "via" parameter | Aaron Patterson | 2014-06-03 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | remove :as and :anchor from IGNORE_OPTIONS | Aaron Patterson | 2014-06-03 | 1 | -3/+5 | |
| | | | | ||||||
* | | | | remove another value from IGNORE_OPTIONS | Aaron Patterson | 2014-06-03 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | shorten up IGNORE_OPTIONS | Aaron Patterson | 2014-06-03 | 1 | -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 once | Aaron Patterson | 2014-06-03 | 1 | -16/+18 | |
| | | | | ||||||
* | | | | Mapping never actually uses @set, so rm | Aaron Patterson | 2014-05-29 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | no reason to make a Mapper object if the path is blank | Aaron Patterson | 2014-05-29 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | no more is_a checks on instantiation | Aaron Patterson | 2014-05-29 | 1 | -9/+4 | |
| | | | | ||||||
* | | | | Path::Pattern is instantiated internally, so make the contructor require a ↵ | Aaron Patterson | 2014-05-29 | 1 | -7/+6 | |
| | | | | | | | | | | | | | | | | strexp object | |||||
* | | | | Strexp#names is only used in a test, so rm | Aaron Patterson | 2014-05-29 | 1 | -4/+0 | |
| | | | | ||||||
* | | | | pass the parsed path from mapper to the Strexp | Aaron Patterson | 2014-05-29 | 2 | -5/+9 | |
| | | | | ||||||
* | | | | add an alternate constructor to Strexp that takes a string | Aaron Patterson | 2014-05-29 | 2 | -8/+10 | |
| | | | | ||||||
* | | | | ask the strexp for the ast | Aaron Patterson | 2014-05-29 | 2 | -3/+7 | |
| | | | | ||||||
* | | | | remove dead code | Aaron Patterson | 2014-05-29 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | disconnect path from the instance | Aaron Patterson | 2014-05-29 | 1 | -6/+6 | |
| | | | | ||||||
* | | | | reuse the ast we already made | Aaron Patterson | 2014-05-29 | 1 | -9/+10 | |
| | | | | ||||||
* | | | | use a parser to extract the group parts from the path | Aaron Patterson | 2014-05-29 | 2 | -3/+7 | |
| | | | | ||||||
* | | | | pass the parsed parameters through the methods so we don't reparse or | Aaron Patterson | 2014-05-29 | 1 | -38/+34 | |
| | | | | | | | | | | | | | | | | require caching code | |||||
* | | | | Merge branch 'master' into mapper | Aaron Patterson | 2014-05-29 | 2 | -6/+6 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update url to rake docs [ci skip] Name#model_name doesn't return a String object Result sets never override a model's column type [ci skip] Make last note show up in postgresql guide. Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581. Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip] Use github url for homepage of log4r [ci skip] Remove TODO. Ensure we always use instances of the adapter specific column class Fix indentation from 1b4b26f [ci skip] [ci skip] Improve form_helpers.md guide. Clear inflections after test. Remove unnecessary include for integration tests. Added documentation for the :param option for resourceful routing |