Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Set the join type on construction | Aaron Patterson | 2013-10-03 | 2 | -6/+5 |
| | | | | | We always set the join type immediately after construction, just make it part of the constructor and we can skip that step | ||||
* | simplify the JoinAssociation constructor, check validity *before* | Aaron Patterson | 2013-10-03 | 2 | -6/+6 |
| | |||||
* | parent is always passed in, so make it non-optional | Aaron Patterson | 2013-10-03 | 1 | -1/+1 |
| | |||||
* | require the files we need so the classes are stand-alone | Aaron Patterson | 2013-10-03 | 3 | -1/+4 |
| | |||||
* | Merge pull request #12435 from sikachu/master-port-12084 | Aaron Patterson | 2013-10-03 | 2 | -1/+10 |
|\ | | | | | Port test from cf1904f to avoid future regression | ||||
| * | Port test from cf1904f to avoid future regression | Prem Sichanugrist | 2013-10-03 | 2 | -1/+10 |
| | | | | | | | | Related issue: #11939, #12084 | ||||
* | | map the association chain to table names | Aaron Patterson | 2013-10-03 | 1 | -4/+2 |
|/ | |||||
* | Merge pull request #8791 from griffinmyers/master | Rafael Mendonça França | 2013-10-03 | 3 | -2/+22 |
|\ | | | | | | | | | | | | | Updated DirtyModel's @changed_attributes hash to be symbol/string agnostic Conflicts: activemodel/CHANGELOG.md | ||||
| * | DirtyModel uses a hash to keep track of any changes made to attributes | William Myers | 2013-05-27 | 3 | -2/+22 |
| | | | | | | | | | | | | | | | | | | of an instance. When using the attribute_will_change! method, you must supply a string and not a symbol or the *_changed? method will break (because it is looking for the attribute name as a string in the keys of the underlying hash). To remedy this, I simply made the underlying hash a HashWithIndifferentAccess so it won't matter if you supply the attribute name as a symbol or string to attribute_will_change!. | ||||
* | | Merge pull request #12431 from GRoguelon/master | Yves Senn | 2013-10-03 | 1 | -1/+1 |
|\ \ | | | | | | | Fix a typo in the code of Testing guide. [ci skip] | ||||
| * | | Fix a typo in the code of Testing guide. | Geoffrey Roguelon | 2013-10-03 | 1 | -1/+1 |
|/ / | | | | | | | Replace the word «Accepts» by «Accept» in the example of custom request headers. | ||||
* | | Merge pull request #12430 from vipulnsward/changelog_fix | Yves Senn | 2013-10-03 | 1 | -1/+1 |
|\ \ | | | | | | | `intiantiated` => `instantiated` [ci skip] | ||||
| * | | `intiantiated` => `instantiated` [ci-skip] | Vipul A M | 2013-10-03 | 1 | -1/+1 |
|/ / | |||||
* | | fix the variable name | Aaron Patterson | 2013-10-02 | 1 | -7/+7 |
| | | |||||
* | | preheat habtm column cache | Aaron Patterson | 2013-10-02 | 1 | -0/+1 |
| | | |||||
* | | add missing require | Aaron Patterson | 2013-10-02 | 1 | -0/+1 |
| | | |||||
* | | remove some duplicate code | Aaron Patterson | 2013-10-02 | 1 | -8/+1 |
| | | |||||
* | | Merge branch 'master' into habtm | Aaron Patterson | 2013-10-02 | 1 | -14/+11 |
|\ \ | | | | | | | | | | | | | * master: copy-edits the new guide with our maintenance policy [ci skip] | ||||
| * | | copy-edits the new guide with our maintenance policy [ci skip] | Xavier Noria | 2013-10-03 | 1 | -14/+11 |
| | | | |||||
* | | | add a note to the changelog | Aaron Patterson | 2013-10-02 | 1 | -0/+3 |
| | | | |||||
* | | | remove HABTM associations | Aaron Patterson | 2013-10-02 | 5 | -66/+0 |
| | | | |||||
* | | | remove HABTM special cases from reflections | Aaron Patterson | 2013-10-02 | 1 | -14/+2 |
| | | | |||||
* | | | remove the HABTM preloader | Aaron Patterson | 2013-10-02 | 2 | -74/+0 |
| | | | |||||
* | | | remove HABTM special cases from associations classes | Aaron Patterson | 2013-10-02 | 4 | -31/+1 |
| | | | |||||
* | | | remove HABTM special cases from the fixtures | Aaron Patterson | 2013-10-02 | 1 | -12/+0 |
| | | | |||||
* | | | repurpose the HABTM builder class | Aaron Patterson | 2013-10-02 | 2 | -29/+3 |
| | | | |||||
* | | | goodbye has_and_belongs_to_many1, we will miss you! | Aaron Patterson | 2013-10-02 | 1 | -4/+0 |
| | | | |||||
* | | | keep track of the left and right reflections and expose those | Aaron Patterson | 2013-10-02 | 2 | -6/+6 |
| | | | |||||
* | | | have the builder create the middle reflection | Aaron Patterson | 2013-10-02 | 2 | -13/+15 |
| | | | |||||
* | | | call the class method to define the callbacks | Aaron Patterson | 2013-10-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into habtm | Aaron Patterson | 2013-10-02 | 15 | -61/+150 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: we can define callbacks without a builder instance push methods that don't depend on the instance to the class get the name from the reflection cache the name and options on the stack decouple belongs_to callback definition from the builder instance. add_before_destroy_callbacks doesn't depend on the instance, so push it to the class. valid_options doesn't depend on the instance, so push it to the class use the information on the reflection to determine whether callbacks should be added Running all isolated test for actionview association builder is no longer needed for counter cache, so remove it push constructable? on to the reflection Adds the Rails maintenance policy to the Guides name is on the reflection, so just use the reflection decouple define_callback from the instance Added activemodel as a explicit dependency unify `Fixes` notes in AR changelog. [ci skip]. improving `reload` doc wording. #12418 [ci skip] Update AR reload doc for the case of manually set primary key attribute [ci skip] | ||||
| * | | we can define callbacks without a builder instance | Aaron Patterson | 2013-10-02 | 4 | -9/+9 |
| | | | |||||
| * | | push methods that don't depend on the instance to the class | Aaron Patterson | 2013-10-02 | 2 | -6/+6 |
| | | | |||||
| * | | get the name from the reflection | Aaron Patterson | 2013-10-02 | 1 | -1/+1 |
| | | | |||||
| * | | cache the name and options on the stack | Aaron Patterson | 2013-10-02 | 1 | -1/+3 |
| | | | |||||
| * | | decouple belongs_to callback definition from the builder instance. | Aaron Patterson | 2013-10-02 | 1 | -4/+4 |
| | | | | | | | | | | | | All the information is on the reflection, so just get it there. | ||||
| * | | add_before_destroy_callbacks doesn't depend on the instance, so push it | Aaron Patterson | 2013-10-02 | 2 | -5/+5 |
| | | | | | | | | | | | | to the class. | ||||
| * | | valid_options doesn't depend on the instance, so push it to the class | Aaron Patterson | 2013-10-02 | 4 | -8/+8 |
| | | | |||||
| * | | use the information on the reflection to determine whether callbacks should ↵ | Aaron Patterson | 2013-10-02 | 1 | -4/+5 |
| | | | | | | | | | | | | be added | ||||
| * | | Merge pull request #12171 from matiaskorhonen/adds-maintenance-policy-to-guides | Xavier Noria | 2013-10-02 | 3 | -0/+70 |
| |\ \ | | | | | | | | | Adds the Rails maintenance policy to the Guides | ||||
| | * | | Adds the Rails maintenance policy to the Guides | Matias Korhonen | 2013-10-03 | 3 | -0/+70 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Merge pull request #12428 from arunagw/running_isolated_test_av | Rafael Mendonça França | 2013-10-02 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Running all isolated test for actionview | ||||
| | * | | | Running all isolated test for actionview | Arun Agrawal | 2013-10-03 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | 1. fix name for activerecord directory 2. Added actionpack directory to run tests | ||||
| * | | | association builder is no longer needed for counter cache, so remove it | Aaron Patterson | 2013-10-02 | 1 | -7/+6 |
| | | | | |||||
| * | | | push constructable? on to the reflection | Aaron Patterson | 2013-10-02 | 5 | -18/+22 |
| | | | | |||||
| * | | | name is on the reflection, so just use the reflection | Aaron Patterson | 2013-10-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | decouple define_callback from the instance | Aaron Patterson | 2013-10-02 | 1 | -2/+4 |
| |/ / | |||||
| * | | Merge pull request #12426 from arunagw/added_activemodel_in_railsgemspec | Guillermo Iguaran | 2013-10-02 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Added activemodel as a explicit dependency | ||||
| | * | | Added activemodel as a explicit dependency | Arun Agrawal | 2013-10-02 | 1 | -0/+1 |
| |/ / | | | | | | | | | | | | | As we have other dependency explicitly here it's fine to add activemodel as well | ||||
| * | | unify `Fixes` notes in AR changelog. [ci skip]. | Yves Senn | 2013-10-02 | 1 | -7/+7 |
| | | |