aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #195 from bigfix/active_model_include_serializationJosé Valim2011-07-184-224/+134
|\
| * ActiveModel support for the :include serialization optionJohn Firebaugh2011-07-172-81/+1
| * Move to_xml tests to xml_serialization_test.rbJohn Firebaugh2011-07-172-143/+133
| * We already have the record; no need to retrieve it againJohn Firebaugh2011-07-171-2/+2
* | Refactor test case to use anonymous class - Thank you @tenderlovePrem Sichanugrist2011-07-181-13/+8
* | Refactor the code a bit to reduce the duplicationPrem Sichanugrist2011-07-171-17/+8
* | Raise an ArgumentError if user passing less number of argument in the dynamic...Prem Sichanugrist2011-07-174-0/+47
* | Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/f...Jon Leighton2011-07-171-2/+2
|/
* Merge pull request #2063 from elight/masterSantiago Pastorino2011-07-142-3/+29
|\
| * Fix and unit test for https://github.com/rails/rails/issues/2059Evan Light2011-07-142-3/+29
* | Merge pull request #1807 from caius/find_in_batches_id_bugSantiago Pastorino2011-07-142-2/+21
|\ \ | |/ |/|
| * Stop find_in_batches using the records after yielding.Caius Durling2011-06-212-2/+21
* | Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patchSantiago Pastorino2011-07-121-7/+13
|\ \
| * | Fix for SqlBypass session storeJoseph Wong2011-07-121-7/+13
* | | Fixed session ID fixation for ActiveRecord::SessionStoreJoseph Wong2011-07-121-2/+6
|/ /
* | Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_...Jon Leighton2011-07-121-2/+2
* | Fix exception if old and new targets are both nil. Fixes #1471.Jon Leighton2011-07-124-2/+15
* | Merge pull request #1929 from sobrinho/masterSantiago Pastorino2011-07-111-0/+14
|\ \
| * | Create a test case for disable_referential_integrityGabriel Sobrinho2011-07-011-0/+14
* | | Merge pull request #1823 from gnarg/masterSantiago Pastorino2011-07-102-2/+10
|\ \ \
| * | | Log instrumentation name for exists? queriesJon Guymon2011-06-222-2/+10
* | | | to_key on a destroyed model should return nilSantiago Pastorino2011-07-092-2/+2
* | | | formatsAkira Matsuda2011-07-091-5/+5
* | | | fix AR having() not to raise NoMethodError when the given argument does not r...Akira Matsuda2011-07-092-3/+10
* | | | Foo.joins(:bar).includes(:bar) should result in a single query with :bar as a...Jon Leighton2011-07-092-1/+19
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-094-30/+30
|\ \ \ \
| * | | | :conditions => whereAkira Matsuda2011-07-081-1/+1
| * | | | :joins => joinsAkira Matsuda2011-07-081-12/+12
| * | | | :include => includesAkira Matsuda2011-07-081-7/+7
| * | | | find(:first) => firstAkira Matsuda2011-07-082-6/+6
| * | | | find(:all) => allAkira Matsuda2011-07-083-22/+22
* | | | | Merge pull request #2017 from Casecommons/active_record_lintJosé Valim2011-07-082-0/+12
|\ \ \ \ \
| * | | | | ActiveRecord::Base should pass ActiveModel::Lint.Grant Hutchins & Peter Jaros2011-07-082-0/+12
* | | | | | Destroy association habtm record before destroying the record itself. Fixes i...Tomas D'Stefano2011-07-084-12/+29
* | | | | | Ensure that the foreign key gets set when doing record.create_association or ...Jon Leighton2011-07-082-2/+25
* | | | | | Refactor PostgreSQLAdapter a bitDaniel Schierbeck2011-07-082-18/+20
|/ / / / /
* | | | | Use Enumerable#with_index. We're on Ruby > 1.8.7 (part II)Akira Matsuda2011-07-081-3/+1
* | | | | Use Enumerable#with_index. We're on Ruby > 1.8.7Akira Matsuda2011-07-081-2/+1
* | | | | Merge pull request #1997 from knapo/masterSantiago Pastorino2011-07-072-2/+7
|\ \ \ \ \
| * | | | | Make `ActiveRecord::Batches#find_each` to not return `self`.knapo2011-07-072-2/+7
* | | | | | Add require ActiveSupport delegation to ActiveRecord::Relation class.Dmitriy Kiriyenko2011-07-071-0/+1
|/ / / / /
* | | | | Merge pull request #1120 from lysenko/collection_singular_idsSantiago Pastorino2011-07-062-1/+6
|\ \ \ \ \
| * | | | | Fix bug in collection_singular_ids on has many through association with condi...Anatoliy Lysenko2011-07-062-1/+6
* | | | | | Merge pull request #1989 from simonbaird/masterSantiago Pastorino2011-07-061-5/+8
|\ \ \ \ \ \
| * | | | | | Fix charset/collate in mysql recreate_databaseSimon Baird2011-07-071-5/+8
* | | | | | | Don't construct association scope in initializer. This yields a big performan...Jon Leighton2011-07-072-7/+11
* | | | | | | Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.Ernie Miller2011-07-061-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1273 from jeremyf/feature-association-proxy-sendSantiago Pastorino2011-07-063-1/+11
|\ \ \ \ \ \
| * | | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handling ...Jeremy Friesen2011-05-243-1/+11
* | | | | | | Merge pull request #1494 from anildigital/masterSantiago Pastorino2011-07-061-2/+2
|\ \ \ \ \ \ \