aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'docrails/master'Xavier Noria2010-08-081-8/+5
|\
| * updating documentation for method configure_dependency_for_has_manyNeeraj Singh2010-08-061-8/+5
* | reduce the number of times current_connection_id is called in with_connection()Aaron Patterson2010-08-061-4/+5
* | do not rely on arel class structureAaron Patterson2010-08-061-1/+3
|/
* fixing whitespace errorsAaron Patterson2010-08-052-10/+10
* avoid passing lists of lists to the group clauseAaron Patterson2010-08-041-1/+1
* Merge remote branch 'docrails/master'Xavier Noria2010-08-058-17/+17
|\
| * standarizes the use of the article "an" for "SQL" and "SQLite"Xavier Noria2010-08-057-7/+7
| * fixing documentationNeeraj Singh2010-08-033-12/+12
* | call to_a since we are not passing anything to all()Aaron Patterson2010-08-041-1/+1
* | fisting indentationAaron Patterson2010-08-041-3/+3
* | do not pass AR objects to ARelAaron Patterson2010-08-041-0/+2
* | I'm unsure how cloning was working in Rails 3 beforewycats2010-08-041-1/+1
* | avoid passing AR::Base objects to Arel when we canAaron Patterson2010-08-031-0/+2
* | query value is converted to_s instead of to_yamlRainerBlessing2010-08-031-1/+1
* | Allow :name to be a Symbol (was this removed by accident?)wycats2010-08-031-0/+2
* | order query is already a string, no need to to_sAaron Patterson2010-08-031-2/+2
|/
* Merge remote branch 'docrails/master' into 3-0-stableXavier Noria2010-08-0326-497/+707
|\
| * Correcting the documentation which wrongly states that each dynamic finder cr...Neeraj Singh2010-08-021-7/+4
| * Adding to AR::Base documentation about dynamically scopeded_by queryNeeraj Singh2010-08-022-11/+19
| * ensuring that description does not exceed 100 columnsNeeraj Singh2010-08-0219-138/+205
| * updating documentation to ensure line does not exceed 100 columnsNeeraj Singh2010-08-022-94/+136
| * ensuring that documentation does not exceed 100 columnsNeeraj Singh2010-08-013-194/+282
| * ensuring that documentation does not exceed 100 columnsNeeraj Singh2010-07-311-51/+65
| * adding the missing closing tagNeeraj Singh2010-07-311-1/+1
| * fixing documentation just a little bitNeeraj Singh2010-07-312-22/+16
* | Remove duplicated logic.José Valim2010-08-021-7/+9
* | Eager loading an association should not change the count of childrenNeeraj Singh2010-08-021-0/+4
* | Tidy up previous commit.José Valim2010-08-022-17/+15
* | test and fix collection_singular_ids= with string primary keys [#5125 state:r...Robert Pankowecki2010-08-021-1/+3
* | Add an internal (private API) after_touch callback. [#5271 state:resolved]José Valim2010-08-024-15/+20
|/
* Merge remote branch 'rails/master'Xavier Noria2010-07-313-26/+20
|\
| * reverting where() functionality, adding a testAaron Patterson2010-07-301-4/+4
| * fewer method calls, using faster methods when possibleAaron Patterson2010-07-301-5/+5
| * reducing function calls and using faster methods for testingAaron Patterson2010-07-302-16/+10
| * Don't increment and then decrement the same counter when re-assigning a belon...Tarmo Tänav2010-07-291-1/+1
* | returns not returned . fixing documentation for reflectionNeeraj Singh2010-07-301-28/+30
|/
* Merge remote branch 'rails/master'Xavier Noria2010-07-3010-27/+29
|\
| * edit pass to apply API guideline wrt the use of "# =>" in example codeXavier Noria2010-07-302-3/+3
| * got the ternary backwards. somehow the sqlite tests passed!Aaron Patterson2010-07-291-1/+1
| * PERF: avoiding splat args and reducing function callsAaron Patterson2010-07-291-8/+5
| * Revert "Avoid uneeded queries in session stores if sid is not given."José Valim2010-07-291-0/+1
| * Shouldn't have committed this! Revert "avoid calling to_sql twice"Aaron Patterson2010-07-281-7/+4
| * avoid calling to_sql twiceAaron Patterson2010-07-281-4/+7
| * slight performance improvement when grabbing an arel tableAaron Patterson2010-07-271-1/+1
| * fixed joining of attributes when using find_or_create_by with multiple attrib...Jon Buda2010-07-281-1/+1
| * Prep for RCDavid Heinemeier Hansson2010-07-261-1/+1
| * Move runtime back to the Thread.currentJosé Valim2010-07-263-13/+17
* | moving time zone related documentation to timestamp.rb from base.rbNeeraj Singh2010-07-292-13/+12
* | adding documentation regarding time_zone_aware_attributes and skip_time_zone_...Neeraj Singh2010-07-291-0/+13