aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Remove extra white-space on some exception messages.Sebastian Martinez2011-05-236-7/+7
* fixing 1.8 support for new fixture testsAaron Patterson2011-05-231-1/+4
* removing CSV fixture supportAaron Patterson2011-05-231-52/+10
* fixture file will validate fixture formatAaron Patterson2011-05-231-1/+8
* return an empty array for empty yaml filesAaron Patterson2011-05-231-1/+3
* use top level file constant for join, etcAaron Patterson2011-05-231-4/+4
* adding AR::Fixtures::File class to wrap a fixture fileAaron Patterson2011-05-232-0/+44
* Removed AS core_ext/kernel/requires as it's not used and is bad practice.Josh Kalderimis2011-05-233-3/+0
* Merge pull request #1228 from fcheung/db_time_fix2José Valim2011-05-231-1/+3
|\
| * Take into account time spent in AR even if a redirect occurs or if it is afte...Frederick Cheung2011-05-231-1/+3
* | Merge pull request #1184 from gnufied/masterAaron Patterson2011-05-231-0/+1
|\ \
| * | fix connection not established error while running rake taskBhavin Kamani2011-05-211-0/+1
* | | Revert "Take into account time spent in AR even if a redirect occurs or if it...David Heinemeier Hansson2011-05-221-5/+3
* | | Fix problem with loading polymorphic associations which have been defined in ...Jon Leighton2011-05-223-13/+26
* | | Take into account time spent in AR even if a redirect occurs or if it is afte...Frederick Cheung2011-05-221-3/+5
| |/ |/|
* | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
* | Merge pull request #1180 from Karunakar/documentation_changeXavier Noria2011-05-212-4/+14
|\ \
| * | ActionMailer deliver method Documentation corrected Ticket #761Ganesh Kumar2011-05-211-1/+1
| * | Documentation Error Fixed for ticket #839Karunakar (Ruby)2011-05-211-3/+13
| |/
* | Merge pull request #1187 from thedarkone/polymorphic-class-fixSantiago Pastorino2011-05-211-1/+1
|\ \
| * | Handle polymorphic_type NOT NULL-able columns as well.thedarkone2011-05-211-1/+1
* | | Add support for passing mass assignment roles to dynamic finders. Closes #1170.Andrew White2011-05-211-2/+2
|/ /
* | Merge pull request #1162 from guilleiguaran/singularize_individual_table_nameJon Leighton2011-05-213-5/+5
|\ \ | |/ |/|
| * AliasTracker.pluralize use pluralize_table_names of modelGuillermo Iguaran2011-05-202-3/+3
| * Allow pluralize_table_names for individual modelGuillermo Iguaran2011-05-201-2/+2
* | Merge pull request #1157 from smartinez87/extra_whitespacesXavier Noria2011-05-201-3/+3
|\ \
| * | Remove extra white spaces.Sebastian Martinez2011-05-191-3/+3
| |/
* | for => each in model migration templateGuillermo Iguaran2011-05-201-1/+1
* | Syntax cleanup: for in => eachGuillermo Iguaran2011-05-193-3/+3
|/
* Implement proxy_owner, proxy_target and proxy_reflection methods on Collectio...Jon Leighton2011-05-192-5/+30
* Merge pull request #1097 from kirillrdy/masterMichael Koziarski2011-05-191-1/+1
|\
| * Year 0 should fall to nil only if month and day are also 0Kirill Radzikhovskyy2011-05-171-1/+1
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-182-17/+17
|\ \
| * | Better doc styling in ActiveRecord::LockingSebastian Martinez2011-05-172-17/+17
* | | on.upcase!Akira Matsuda2011-05-191-1/+1
* | | why not use JOIN statement for joining tables? (vol. 2)Akira Matsuda2011-05-181-21/+12
* | | remove unused table from FROM clauseAkira Matsuda2011-05-181-2/+0
* | | why not use JOIN statement for joining tables?Akira Matsuda2011-05-181-3/+3
* | | Add missing requireSantiago Pastorino2011-05-171-0/+1
* | | Don't pass a block as we are yieldingAndrew White2011-05-171-1/+1
* | | Add block setting of attributes to singular associationsAndrew White2011-05-172-11/+12
* | | Pass the attribute and option hashes to build_associationAndrew White2011-05-172-8/+12
| |/ |/|
* | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_falseJon Leighton2011-05-161-1/+1
|\ \
| * | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ...Guillermo Iguaran2011-05-151-1/+1
* | | Add doc to #attribute_namesSebastian Martinez2011-05-151-0/+3
* | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. This...Prem Sichanugrist2011-05-151-0/+8
| |/ |/|
* | These extra array operations appear to be unnecessary. Reasoning:Jon Leighton2011-05-141-8/+2
* | CollectionAssociation#merge_target_lists should write to the underlying attri...Jon Leighton2011-05-141-5/+2
* | An attempt to make CollectionAssociation#merge_target_lists make more sense.Jon Leighton2011-05-141-16/+35
|/
* Added some docs to controller runtime.José Valim2011-05-141-1/+4