Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Final tidy up on templates inheritance. | José Valim | 2010-12-27 | 5 | -17/+15 | |
| | | ||||||
* | | Speed up template inheritance and remove template inheritance option | wycats | 2010-12-26 | 2 | -28/+17 | |
| | | ||||||
* | | A bunch of cleanup on the inherited template patch | wycats | 2010-12-26 | 6 | -21/+36 | |
| | | ||||||
* | | all tests pass | artemave | 2010-12-26 | 9 | -40/+40 | |
| | | ||||||
* | | #948 make template inheritance optional | artemave | 2010-12-26 | 2 | -4/+23 | |
| | | ||||||
* | | #948 template_inheritance | artemave | 2010-12-26 | 12 | -42/+129 | |
| | | ||||||
* | | try not to make so many funcalls | Aaron Patterson | 2010-12-26 | 1 | -3/+6 | |
| | | ||||||
* | | make our hash of klasses and ids actually have classes for keys | Aaron Patterson | 2010-12-26 | 1 | -8/+6 | |
| | | ||||||
* | | stop calling deprecated apis | Aaron Patterson | 2010-12-26 | 2 | -5/+5 | |
| | | ||||||
* | | Refactor we_can_set_the_inverse_on_this? to use a less bizarre name amongst ↵ | Jon Leighton | 2010-12-26 | 10 | -52/+41 | |
| | | | | | | | | other things | |||||
* | | small rewording of my entry in the credits | Xavier Noria | 2010-12-26 | 1 | -1/+1 | |
| | | ||||||
* | | no docs credits are written in first person, thanks to Vijay Dev for ↵ | Xavier Noria | 2010-12-26 | 1 | -1/+1 | |
| | | | | | | | | spotting this | |||||
* | | Add a HasAssociation module for common code for has_* associations | Jon Leighton | 2010-12-26 | 8 | -61/+69 | |
| | | ||||||
* | | Remove AssociationProxy#dependent? - it's badly named and only used in one place | Jon Leighton | 2010-12-26 | 2 | -6/+1 | |
| | | ||||||
* | | Associations: DRY up the code which is generating conditions, and make it ↵ | Jon Leighton | 2010-12-26 | 7 | -65/+50 | |
| | | | | | | | | all use arel rather than SQL strings | |||||
* | | Fix dodgy tests which were effectively asserting nil == nil | Jon Leighton | 2010-12-26 | 2 | -3/+4 | |
| | | ||||||
* | | Remove custom_select param from construct_select, as it isn't used | Jon Leighton | 2010-12-26 | 1 | -3/+3 | |
| | | ||||||
* | | Remove construct_from from ThroughAssociationScope - it's not called from ↵ | Jon Leighton | 2010-12-26 | 1 | -4/+0 | |
| | | | | | | | | anywhere | |||||
* | | Set the create scope to an empty hash in ThroughAssociationScope. For ↵ | Jon Leighton | 2010-12-26 | 1 | -1/+5 | |
| | | | | | | | | reasoning please see the inline code comments. | |||||
* | | Use conditionals and implicit returns rather than explicit returns and ↵ | Jon Leighton | 2010-12-26 | 1 | -3/+7 | |
| | | | | | | | | postfix ifs (it's easier to read) | |||||
* | | Remove has_cached_counter? and cached_counter_attribute_name from ↵ | Jon Leighton | 2010-12-26 | 1 | -8/+0 | |
| | | | | | | | | HasManyThroughAssociation, as the exact same methods are inherited from HasManyAssociation | |||||
* | | Remove pointless use of 'private' | Jon Leighton | 2010-12-26 | 1 | -1/+0 | |
| | | ||||||
* | | Use the through association proxy for operations on the through record, so ↵ | Jon Leighton | 2010-12-26 | 3 | -17/+17 | |
| | | | | | | | | that those operations are automatically scoped and therefore construct_join_attributes does not need to use construct_owner_attributes. | |||||
* | | Remove target_obsolete? which is not called from anywhere | Jon Leighton | 2010-12-26 | 1 | -4/+0 | |
| | | ||||||
* | | scoped.where_values_hash is never nil | Jon Leighton | 2010-12-26 | 1 | -1/+1 | |
| | | ||||||
* | | Update JQuery UJS | Santiago Pastorino | 2010-12-26 | 1 | -26/+48 | |
| | | ||||||
* | | Update Prototype UJS | Santiago Pastorino | 2010-12-26 | 1 | -29/+43 | |
| | | ||||||
* | | use https to fetch files from GitHub | Akira Matsuda | 2010-12-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere [#6223 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | refactor to use group_by | Aaron Patterson | 2010-12-25 | 1 | -3/+3 | |
| | | ||||||
* | | arel will deal with casting the ids, so we can delete this | Aaron Patterson | 2010-12-25 | 1 | -13/+1 | |
| | | ||||||
* | | use arel to determine selection column | Aaron Patterson | 2010-12-25 | 1 | -2/+1 | |
| | | ||||||
* | | refactoring method selection | Aaron Patterson | 2010-12-25 | 1 | -10/+5 | |
| | | ||||||
* | | using arel to compile sql statements | Aaron Patterson | 2010-12-25 | 4 | -10/+21 | |
| | | ||||||
* | | use sql literal factory method | Aaron Patterson | 2010-12-25 | 1 | -1/+1 | |
| | | ||||||
* | | take more advantage of arel sql compiler | Aaron Patterson | 2010-12-25 | 2 | -13/+21 | |
| | | ||||||
* | | refactoring AST building | Aaron Patterson | 2010-12-25 | 1 | -5/+3 | |
| | | ||||||
* | | use arel to compile SQL statements | Aaron Patterson | 2010-12-25 | 1 | -6/+15 | |
| | | ||||||
* | | stop redifining methods on every call to set_primary_key | Aaron Patterson | 2010-12-24 | 3 | -8/+23 | |
| | | ||||||
* | | use the sql literal factory method | Aaron Patterson | 2010-12-24 | 1 | -1/+1 | |
| | | ||||||
* | | stop the recursive insanity | Aaron Patterson | 2010-12-24 | 1 | -5/+10 | |
| | | ||||||
* | | setting the primary key on the update manager | Aaron Patterson | 2010-12-24 | 1 | -0/+1 | |
| | | ||||||
* | | Bump up rack-cache | Santiago Pastorino | 2010-12-24 | 1 | -1/+1 | |
|/ | ||||||
* | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2010-12-24 | 42 | -148/+401 | |
|\ | ||||||
| * | Verify that there is no unwanted implicit readonly set on ↵ | oleg dashevskii | 2010-12-23 | 1 | -1/+13 | |
| | | | | | | | | Model.has_many_through.find(id) [#5442 state:resolved] | |||||
| * | Raise an error for associations which try to go :through a polymorphic ↵ | Jon Leighton | 2010-12-23 | 4 | -6/+22 | |
| | | | | | | | | association [#6212 state:resolved] | |||||
| * | If a has_many goes :through a belongs_to, and the foreign key of the ↵ | Jon Leighton | 2010-12-23 | 14 | -35/+124 | |
| | | | | | | | | belongs_to changes, then the has_many should be considered stale. | |||||
| * | Improved strategy for updating a belongs_to association when the foreign key ↵ | Jon Leighton | 2010-12-23 | 7 | -45/+37 | |
| | | | | | | | | changes. Rather than resetting each affected association when the foreign key changes, we should lazily check for 'staleness' (where fk does not match target id) when the association is accessed. | |||||
| * | Test to verify that #2189 (count with has_many :through and a named_scope) ↵ | Jon Leighton | 2010-12-23 | 2 | -0/+7 | |
| | | | | | | | | is fixed | |||||
| * | Revert "Optimize <association>_ids for hm:t with belongs_to source". The ↵ | Jon Leighton | 2010-12-23 | 2 | -14/+3 | |
| | | | | | | | | | | | | | | | | | | | | optimisation has too many edge cases, such as when the reflection, source reflection, or through reflection has conditions, orders, etc. [#6153 state:resolved] This reverts commit 373b053dc8b99dac1abc3879a17a2bf8c30302b5. Conflicts: activerecord/lib/active_record/associations.rb | |||||
| * | Test demonstrating problem with foo.association_ids where it's a has_many ↵ | Jon Leighton | 2010-12-23 | 1 | -0/+4 | |
| | | | | | | | | :through with :conditions, with a belongs_to as the source reflection |