aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sprocketsJoshua Peek2011-03-3096-608/+1729
|\
| * Fix filter :only and :except with implicit actionsAndrew White2011-03-232-12/+17
| * Add a failing test case for an implicit action with a before filter.Manfred Stienstra2011-03-233-0/+24
| * Fix before_type_cast for timezone aware attributes by caching converted value...Adam Meehan2011-03-232-19/+16
| * Make clearing of HABTM join table contents happen in an after_destory callback.Murray Steele2011-03-231-12/+12
| * Failing test case to show that habtm join table contents are removed when a m...Murray Steele2011-03-231-0/+34
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-238-7/+36
| |\
| | * Update 'Getting Started on Windows' tip to go to one-click Rails InstallerDr Nic Williams2011-03-221-1/+1
| | * Caching guide: Capitalize 'Note' so that it's rendered as a proper noteRyan Bigg2011-03-231-1/+1
| | * Querying guide: mention that performing a where on an relation that contains ...Ryan Bigg2011-03-221-1/+3
| | * Querying guide: mention that performing a where on an relation that contains ...Ryan Bigg2011-03-221-0/+14
| | * Beef up Rails::Railtie::Configuration docsGabriel Horner2011-03-191-0/+8
| | * remove bank linePaco Guzman2011-03-181-1/+0
| | * Add link to mailing-listNicolas Cavigneaux2011-03-161-1/+1
| | * Remove incorrect comment that a default value of NULL cannot be set with chan...Manuel Meurer2011-03-161-3/+2
| | * doc :anchor option for #match in routesGabriel Horner2011-03-151-0/+7
| * | Fix test for prepend giving a false positive. [#5716 state:resolved]Aditya Sanghi2011-03-232-3/+2
| * | parse dates to yaml in json arraysDiego Carrion2011-03-222-2/+4
| * | test json decoding with time parsing disabled with all backends and respect A...Diego Carrion2011-03-222-7/+7
| * | use class_eval with a string when it's possibleSantiago Pastorino2011-03-223-7/+21
| * | Allow to read and write AR attributes with non valid identifiersSantiago Pastorino2011-03-224-2/+22
| * | Do not in place modify what table_name returnsSantiago Pastorino2011-03-223-13/+2
| * | Install rb-fsevent gem if ENV[RB_FSEVENT] is setPiotr Sarnacki2011-03-221-0/+3
| * | adding missing requireAaron Patterson2011-03-221-0/+1
| * | Merge branch 'master' into fuuuAaron Patterson2011-03-2220-45/+256
| |\ \
| | * | Do not show optional (.:format) block for wildcard route [#6605 state:resolved]Prem Sichanugrist2011-03-222-1/+8
| | * | pushing id insertion and prefetch primary keys down to Relation#insertAaron Patterson2011-03-224-12/+23
| | * | use prepared statements to fetch the last insert idAaron Patterson2011-03-211-3/+4
| * | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-182-8/+69
| |\ \ \
| * | | | Add order clauses to fix some tests which were failing under 1.8 on oracle an...Jon Leighton2011-03-182-14/+14
| * | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-1630-81/+164
| |\ \ \ \
| * | | | | oracle, y u defy meJon Leighton2011-03-165-13/+15
| * | | | | Fix tests under postgres - we should always put conditions in the WHERE part ...Jon Leighton2011-03-124-19/+23
| * | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-128-20/+117
| |\ \ \ \ \
| * | | | | | Resolve some TODO comments which I decided did not need anything doneJon Leighton2011-03-123-9/+5
| * | | | | | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-112-23/+3
| * | | | | | Abstract some common code from AssociationScope and JoinDependency::JoinAssoc...Jon Leighton2011-03-114-97/+83
| * | | | | | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
| * | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-1049-129/+231
| |\ \ \ \ \ \
| * | | | | | | Rename Reflection#through_reflection_chain and #through_options to Reflection...Jon Leighton2011-03-105-50/+53
| * | | | | | | Move the code which builds a scope for through associations into a generic As...Jon Leighton2011-03-109-215/+162
| * | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0725-44/+193
| |\ \ \ \ \ \ \
| * | | | | | | | Fix test_has_many_association_through_a_has_many_association_with_nonstandard...Jon Leighton2011-03-072-2/+2
| * | | | | | | | Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-072-1/+27
| * | | | | | | | Refactor ThroughAssociation#join_to to be much smaller, and independent of co...Jon Leighton2011-03-062-84/+34
| * | | | | | | | Refactor ThroughAssociation#tables to just be a flat array of tables in the o...Jon Leighton2011-03-061-75/+70
| * | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0563-117/+380
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
| * | | | | | | | | Push source_type and polymorphic conditions out of ThroughAssociation and Joi...Jon Leighton2011-03-054-47/+13
| * | | | | | | | | Add a test for STI on the through where the through is nested, and change the...Jon Leighton2011-03-056-13/+46