aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* have an actual `NullColumn` object and update docs accordingly.Yves Senn2014-06-044-5/+16
| | | | | | Follow up to #15438 and #15502. /cc @sgrif
* Revert "Correct Documentation for asset_tag_helpers"Rafael Mendonça França2014-06-041-17/+16
| | | | | | | | | | This reverts commit c22a253d1a72602331db1eba3e91bc945eff2346. Reason: Our documentation assumes the assets are in the proper place and we are using the default Rails stack. With the default Rails stack and the assets being in the correct place the assets helpers uses the `/assets` prefix.
* Merge pull request #15502 from sgrif/sg-use-null-columnYves Senn2014-06-042-23/+23
|\ | | | | | | Use null column for association key types
| * Use null column for association key typesSean Griffin2014-06-042-23/+23
| |
* | Merge branch 'master' of github.com:rails/railsAaron Patterson2014-06-0434-134/+268
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| * | For our build, stick with mail 2.5.x for nowMatthew Draper2014-06-051-0/+1
| | | | | | | | | | | | 2.6 currently has many warnings, which are failing the Travis build.
| * | Merge pull request #15504 from sgrif/sg-postgres-defaultsRafael Mendonça França2014-06-042-48/+11
| |\ \ | | | | | | | | Collapse PG default extractoin of most types to single regex
| | * | Collapse PG default extractoin of most types to single regexSean Griffin2014-06-042-48/+11
| | |/ | | | | | | | | | | | | | | | | | | For any type that is represented as a string and then type cast, we do not need separate regular expressions for the various types. No function will match this regex. User defined types *should* match this, so that the type object can decide what to do with the value.
| * | Merge pull request #15495 from maurogeorge/action-mailer-subject-guidesRafael Mendonça França2014-06-041-0/+18
| |\ \ | | | | | | | | Add default_i18n_subject to the guides
| | * | Pluralize paramsMauro George2014-06-031-1/+1
| | | |
| | * | Add default_i18n_subject to the guidesMauro George2014-06-031-0/+18
| | | | | | | | | | | | | | | | [ci skip]
| * | | Merge pull request #15505 from akshay-vishnoi/doc_changesSantiago Pastorino2014-06-041-1/+1
| |\ \ \ | | | | | | | | | | Correct result, previously showing wrong result
| | * | | Correct result, previously showing wrong resultAkshay Vishnoi2014-06-041-1/+1
| |/ / /
| * | | Merge pull request #15463 from geopet/refactor_xml_compute_typeRafael Mendonça França2014-06-042-6/+7
| |\ \ \ | | |_|/ | |/| | Refactor XML serializer to not depend on `serialized_attributes`
| | * | Refactor XML serializer to not depend on `serialized_attributes`Geoff Petrie & Sean Griffin2014-06-011-3/+5
| | | |
| | * | Test the serialized types of virtual columns in XMLGeoff Petrie & Sean Griffin2014-06-012-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous tests were passing, because nothing ever looked at the generated XML. What was previously being generated was `<firstname type="NilClass">...`, which is not consistent with all other cases where there is not a known type.
| * | | Merge pull request #15500 from ↵Yves Senn2014-06-041-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/change-wording-of-explanation-about-precision-and-scale-of-decimal-numbers Change wording of explanation about precision & scale of decimal numbers [ci skip]
| | * | | Change wording of explanation about precision & scale of decimal numbers [ci ↵Prathamesh Sonpatki2014-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | skip]
| * | | | Merge pull request #15482 from laurocaetano/fix-regression-for-eager-loadCarlos Antonio da Silva2014-06-044-2/+27
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix regression on eager loading association based on SQL query rather than existing column. Conflicts: activerecord/CHANGELOG.md
| | * | | Fix regression on eager loading association based on SQL query ratherLauro Caetano2014-06-034-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than existing column. Fixes #15480.
| * | | | Cleaned up duplicated CHANGELOG entry [ci skip]Godfrey Chan2014-06-031-3/+2
| | | | |
| * | | | 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
| * | | | | Merge pull request #15499 from eileencodes/reuse-available-belongs_to-methodRafael Mendonça França2014-06-033-5/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | reuse available belongs_to? method
| | * | | | | reuse available belongs_to? methodeileencodes2014-06-033-5/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reflection has a `belongs_to?` method. Instead of checking for `macro == :belongs_to` throughout the source reuse existing method. I also bumped `foreign_key_present?` method onto on line because the `belongs_to?` makes it shorter than other longer lines in the same class.
| * | | | | 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 #15438 from sgrif/sg-null-columnRafael Mendonça França2014-06-035-14/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a null column when no column exists for an attribute Conflicts: activerecord/CHANGELOG.md
| | * | | | | Return a null column when no column exists for an attributeSean Griffin2014-06-035-14/+40
| | | | | | |
| * | | | | | 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
| | | | | | | |
| * | | | | | | Merge pull request #15172 from notEthan/active_record_pretty_printRafael Mendonça França2014-06-033-0/+95
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement ActiveRecord::Base#pretty_print Conflicts: activerecord/CHANGELOG.md
| | * | | | | | | implement ActiveRecord::Base#pretty_print + changelogEthan2014-05-293-0/+95
| | | | | | | | |
| * | | | | | | | Merge pull request #15492 from sgrif/sg-dirty-defaultsRafael Mendonça França2014-06-035-2/+40
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Keep column defaults in type cast form
| | * | | | | | | | Keep column defaults in type cast formSean Griffin2014-06-035-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contract of `_field_changed?` assumes that the old value is always type cast. That is not the case for the value in `Column#default` as things are today. It appears there are other public methods that assume that `Column#default` is type cast, as well. The reason for this change originally was because the value gets put into `@raw_attributes` in initialize. This reverts to the old behavior on `Column`, and updates `initialize` to make sure that the values are in the right format.
| * | | | | | | | | Merge pull request #15493 from bf4/relax_mail_depRafael Mendonça França2014-06-031-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax mail gem constraint from ~> 2.5.4 to ~> 2.5
| | * | | | | | | | | Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4Benjamin Fleischer2014-06-031-1/+1
| | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows Rails users to install mail 2.6 which relaxes the mime-types dependency, which is a big win for a lot of people. Previously, the mail gem restricted mime-types to ~> 1.16 but now it has expanded to [">= 1.16", "< 3"] And the mime-types maintainer will also be checking that 2.x releases don't break mail. See https://github.com/mikel/mail/pull/713 https://rubygems.org/gems/mail/versions/2.6.0
* | / | | | | | | | push splitting "to" up the callstackAaron Patterson2014-06-031-15/+20
|/ / / / / / / / /
* | | | | | | | | force table creationAaron Patterson2014-06-031-2/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #15447 from akshay-vishnoi/test-casesRafael Mendonça França2014-06-031-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Test `except!` in other cases too
| * | | | | | | | | Test `except!` in other cases tooAkshay Vishnoi2014-05-311-0/+8
| | | | | | | | | |
* | | | | | | | | | 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`.
* | | | | | | | | | Revert "test pg, we don't care about the internal state of `column#default`."Yves Senn2014-06-037-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "test pg, remove unused column assignments. Follow up to 254cdf47" Related to #15492 This reverts commit 254cdf4728291277f3fbaa854f34495030e476b4. This reverts commit 4bcf9029452e0c760af04faab6b549710401e8cf. There are public methods that assume `Column#default` is type casted. The return value of `Column#default` is publicly relevant and should not change. /cc @sgrif
* | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:12:45 +0000