Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor ThroughAssociation#join_to to be much smaller, and independent of ↵ | Jon Leighton | 2011-03-06 | 2 | -84/+34 |
| | | | | construct_owner_conditions. | ||||
* | Refactor ThroughAssociation#tables to just be a flat array of tables in the ↵ | Jon Leighton | 2011-03-06 | 1 | -75/+70 |
| | | | | order that they should be joined together. | ||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-05 | 63 | -117/+380 |
|\ | | | | | | | | | Conflicts: activerecord/CHANGELOG | ||||
| * | use Arel::Table#alias rather than passing the :as parameter | Aaron Patterson | 2011-03-05 | 2 | -4/+4 |
| | | |||||
| * | revises the RDoc of Hash#reverse_merge | Xavier Noria | 2011-03-05 | 1 | -13/+7 |
| | | |||||
| * | copy-edits 819762c | Xavier Noria | 2011-03-05 | 1 | -4/+3 |
| | | | | | | | | | | * simplifies some sentences * use a more neutral language with less you/yours | ||||
| * | copy-edits 108561f | Xavier Noria | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | typo changes | JudeArasu | 2011-03-05 | 1 | -3/+4 |
| | | |||||
| * | Railties typos. | R.T. Lechow | 2011-03-05 | 4 | -6/+6 |
| | | |||||
| * | Action Pack typos. | R.T. Lechow | 2011-03-05 | 11 | -15/+15 |
| | | |||||
| * | Active Record typos. | R.T. Lechow | 2011-03-05 | 6 | -10/+10 |
| | | |||||
| * | Active Support typos. | R.T. Lechow | 2011-03-05 | 7 | -7/+7 |
| | | |||||
| * | Active Resource typos. | R.T. Lechow | 2011-03-05 | 5 | -6/+6 |
| | | |||||
| * | Active Model typos. | R.T. Lechow | 2011-03-05 | 2 | -2/+2 |
| | | |||||
| * | Properly escaped a + in the dynamic segments TIP | tashian | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | Adds link to Object.blank? from Object.present? | Jonathon D. Jones | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | fixes a missmatched column in example | mjy | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | Spelling mistake | JudeArasu | 2011-03-05 | 1 | -1/+2 |
| | | |||||
| * | Correct spelling for Base64 in action_mailer | Dalibor Nasevic | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | Removed link to un-existing Issues page on Github | Dalibor Nasevic | 2011-03-05 | 1 | -3/+0 |
| | | |||||
| * | Added some new advice on applying patches | Lars Smit | 2011-03-05 | 1 | -0/+14 |
| | | |||||
| * | Fix incorrect example. | Ben Orenstein | 2011-03-05 | 1 | -2/+2 |
| | | |||||
| * | Fix incorrect word. | Ben Orenstein | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | Pointing out that dynamic_form plugin must be installed to be able to use ↵ | Rodrigo Navarro | 2011-03-05 | 1 | -1/+14 |
| | | | | | | | | error_messages and error_messages_for view helpers. | ||||
| * | Clean up wording. | Ben Orenstein | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | use resources in place of map.resources | Vijay Dev | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | Clarify comment by removing french reference ('a la'). Should improve ↵ | Ben Orenstein | 2011-03-05 | 1 | -1/+1 |
| | | | | | | | | readability for non-native english speakers. | ||||
| * | Example descriptions and their examples were flipped. Fix. | Ben Orenstein | 2011-03-05 | 1 | -3/+3 |
| | | |||||
| * | Warn people that these methods are deprecated. | Ben Orenstein | 2011-03-05 | 1 | -0/+2 |
| | | |||||
| * | Correct example that did not do what it claimed. Rework explanation. | Ben Orenstein | 2011-03-05 | 1 | -5/+5 |
| | | |||||
| * | added information about TEST_DIR env variable | Ilya Zayats | 2011-03-05 | 1 | -0/+8 |
| | | |||||
| * | implements ActiveRecord::Base.connection_config to be able to check the ↵ | Xavier Noria | 2011-03-05 | 3 | -0/+18 |
| | | | | | | | | configuration of the current connection at runtime | ||||
| * | Fix CI | Santiago Pastorino | 2011-03-04 | 1 | -8/+8 |
| | | |||||
| * | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 2 | -2/+20 |
| | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.) | ||||
| * | Fix a couple of tests in join_model_test.rb which were failing when the ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+2 |
| | | | | | | | | identity map is turned off | ||||
| * | Make CI test with and without IM | Santiago Pastorino | 2011-03-04 | 1 | -4/+44 |
| | | |||||
| * | reverted tests deleted by 080345baca1076a9788d, refactored implementations ↵ | Diego Carrion | 2011-03-04 | 1 | -3/+13 |
| | | | | | | | | | | | | should not invalidate the validations Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | refactored Time#<=> and DateTime#<=> by removing unnecessary calls without ↵ | Diego Carrion | 2011-03-04 | 3 | -20/+5 |
| | | | | | | | | | | | | losing performance Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Add an option to FormBuilder to omit hidden field with id | Alexander Uvarov | 2011-03-04 | 2 | -2/+157 |
| | | | | | | | | | | | | [#4551 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | log and readme should respect --quiet | José Valim | 2011-03-04 | 2 | -3/+29 |
| | | |||||
* | | Use Base#type_condition in JoinAssociation | Jon Leighton | 2011-03-05 | 2 | -17/+6 |
| | | |||||
* | | Push source_type and polymorphic conditions out of ThroughAssociation and ↵ | Jon Leighton | 2011-03-05 | 4 | -47/+13 |
| | | | | | | | | JoinDependency::JoinAssociation and into the reflection instead. | ||||
* | | Add a test for STI on the through where the through is nested, and change ↵ | Jon Leighton | 2011-03-05 | 6 | -13/+46 |
| | | | | | | | | the code which support this | ||||
* | | Stop identity-mapping the through records in the preloader since I fixed the ↵ | Jon Leighton | 2011-03-04 | 1 | -5/+0 |
| | | | | | | | | underlying problem in the habtm preloader. | ||||
* | | Fix a couple of tests in join_model_test.rb which were failing when the ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+2 |
| | | | | | | | | identity map is turned off | ||||
* | | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 2 | -2/+20 |
| | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.) | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 5 | -9/+28 |
|\| | |||||
| * | only compute path.to_s once | Aaron Patterson | 2011-03-02 | 1 | -1/+4 |
| | | |||||
| * | remove to_s implementation so that inspect is helpful | Aaron Patterson | 2011-03-02 | 1 | -1/+0 |
| | | |||||
| * | * LocalCache strategy is now a real middleware class, not an anonymous class | Aaron Patterson | 2011-03-02 | 2 | -23/+32 |
| | | | | | | | | posing for pictures. |