aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Bump up rack-cacheSantiago Pastorino2010-12-241-1/+1
|/ /
* | Merge branch 'master' of github.com:rails/railsXavier Noria2010-12-2442-148/+401
|\ \
| * | Verify that there is no unwanted implicit readonly set on Model.has_many_thro...oleg dashevskii2010-12-231-1/+13
| * | Raise an error for associations which try to go :through a polymorphic associ...Jon Leighton2010-12-234-6/+22
| * | If a has_many goes :through a belongs_to, and the foreign key of the belongs_...Jon Leighton2010-12-2314-35/+124
| * | Improved strategy for updating a belongs_to association when the foreign key ...Jon Leighton2010-12-237-45/+37
| * | Test to verify that #2189 (count with has_many :through and a named_scope) is...Jon Leighton2010-12-232-0/+7
| * | Revert "Optimize <association>_ids for hm:t with belongs_to source". The opti...Jon Leighton2010-12-232-14/+3
| * | Test demonstrating problem with foo.association_ids where it's a has_many :th...Jon Leighton2010-12-231-0/+4
| * | When a has_many association is not :uniq, appending the same record multiple ...Jon Leighton2010-12-233-3/+24
| * | Fix behaviour of foo.has_many_through_association.select('custom select') [#6...Michał Łomnicki2010-12-232-2/+7
| * | Fix creation of has_many through records with custom primary_key option on be...Szymon Nowak2010-12-235-2/+38
| * | Verify that has_one :through preload respects the :conditions [#2976 state:re...Will Bryant2010-12-232-0/+13
| * | Don't allow a has_one association to go :through a collection association [#2...Jon Leighton2010-12-235-9/+26
| * | Don't deprecate to_prepare.José Valim2010-12-232-9/+11
| * | Clean up callbacks should also be called on exceptions.José Valim2010-12-232-0/+17
| * | avoid duping and new objectsAaron Patterson2010-12-231-2/+3
| * | fixed retrieval of primary key value in Ralation#insert methodRaimonds Simanovskis2010-12-231-1/+1
| * | Fix for default_scope tests to ensure comparing of equally sorted listsRaimonds Simanovskis2010-12-232-2/+2
| * | arel can escape the id, so avoid using the database connectionAaron Patterson2010-12-221-1/+1
| * | Arel::Table#[] always returns an attribute, so no need for ||Aaron Patterson2010-12-221-1/+1
| * | probably should use the some_ids variable here. o_OAaron Patterson2010-12-221-1/+1
| * | removing SQL interpolation, please use scoping and attribute conditionals as ...Aaron Patterson2010-12-224-13/+4
| * | use arel to compile SQL rather than build stringsAaron Patterson2010-12-221-1/+8
| * | to_sym stuff before passing it to arelAaron Patterson2010-12-222-2/+2
| * | build an AST rather than build SQL stringsAaron Patterson2010-12-221-1/+10
| * | Allow registering javascript/stylesheet_expansions to existing symbolsSantiago Pastorino2010-12-223-4/+29
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-2411-75/+294
|\ \ \ | |/ / |/| |
| * | Revert "Query guide: arel_table, eq and eq_any" along with other commits that...Ryan Bigg2010-12-241-131/+0
| * | Query guide: visists => visitsRyan Bigg2010-12-241-1/+1
| * | minor convention editVijay Dev2010-12-241-1/+1
| * | fixing typo that crept in 2c8938fVijay Dev2010-12-241-1/+1
| * | It's JavaScript :)Vijay Dev2010-12-245-17/+17
| * | fixed inject example and some minor editsVijay Dev2010-12-241-6/+6
| * | indentation fixVijay Dev2010-12-231-9/+9
| * | Edits to caching/fragments.Rizwan Reza2010-12-231-17/+39
| * | More minor edits.Rizwan Reza2010-12-231-5/+5
| * | Revised documentation for cache_helper.Rizwan Reza2010-12-231-12/+10
| * | Query guide: add or conditionsRyan Bigg2010-12-231-0/+11
| * | Query guide: cover further ARel methodsRyan Bigg2010-12-231-7/+76
| * | Query guide: Document "in" methodsRyan Bigg2010-12-231-0/+25
| * | Query guide: arel_table, eq and eq_anyRyan Bigg2010-12-231-0/+26
| * | Query guide: specify what type of objects scopes returnRyan Bigg2010-12-231-1/+1
| * | Query guide: Ordering, selecting and so on shouldn't be nested in conditions ...Ryan Bigg2010-12-231-9/+9
| * | Query Guide: update ChangelogRyan Bigg2010-12-231-0/+1
| * | Query guide: class methods are still available on associationsRyan Bigg2010-12-231-1/+5
| * | Query guide: scopes with arguments should be instead defined as class methods.Ryan Bigg2010-12-231-3/+31
| * | Query guide: fix indentationRyan Bigg2010-12-231-13/+13
| * | Remove comma [samuelkadoph]Ryan Bigg2010-12-231-1/+1
| * | Query guide: lambdas must be used when working with scopesRyan Bigg2010-12-231-0/+12