aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-243-5/+5
|\
| * Changed a few instances of of words in the API docs written in British Englis...Oemuer Oezkir2011-07-243-5/+5
* | Merge pull request #2185 from castlerock/lazy_load_abstract_adapterAaron Patterson2011-07-232-3/+2
|\ \
| * | lazy load ConnectionAdapters remove require.Vishnu Atrai2011-07-222-3/+2
* | | registers the recent change to date multiparameter handling in the CHANGELOGXavier Noria2011-07-231-0/+5
* | | Merge pull request #2086 from amatsuda/date_multiparameter_nilXavier Noria2011-07-232-27/+15
|\ \ \
| * | | convert multiple Date parameters into a nil if any of its bits were blankAkira Matsuda2011-07-152-27/+15
* | | | Merge pull request #2171 from arunagw/database-rake-1.9.2Santiago Pastorino2011-07-231-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | This conditions is required to work with database create task. 1.9.2 is havin...Arun Agrawal2011-07-211-1/+2
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-231-1/+1
|\ \ \ \
| * | | | use simpler words in docsVijay Dev2011-07-101-1/+1
* | | | | Merge pull request #2188 from vijaydev/patch-6Xavier Noria2011-07-221-1/+1
|\ \ \ \ \
| * | | | | Fixes typoVijay Dev2011-07-221-1/+1
| | |_|_|/ | |/| | |
* / | | | forgot to add this test caseAaron Patterson2011-07-221-0/+14
|/ / / /
* | | | adding changelog entry for connection urlsAaron Patterson2011-07-211-0/+5
* | | | adding more tests around database uri parsingAaron Patterson2011-07-212-5/+37
* | | | move around testsAaron Patterson2011-07-212-30/+10
* | | | fix postgres connection url testTerence Lee2011-07-201-1/+1
* | | | Add documentation for URL connection strings.Glenn Gillen2011-07-201-0/+6
* | | | Added test for postgres connections as URL. Fixed query param parsing.Glenn Gillen2011-07-202-1/+14
* | | | Provide database connection settings as a URL.Glenn Gillen2011-07-202-0/+33
* | | | no need to sort the valuesAaron Patterson2011-07-201-1/+1
* | | | assign_nested_attributes_for_collection_association should work with Ruby 1.9...Franck Verrot2011-07-202-1/+6
* | | | Revert "this fixes a brittle test in fixtures_test.rb which fails when you ar...Aaron Patterson2011-07-201-2/+2
* | | | bigdecimal should be typecast to a float on sqlite3. fixes #2162Aaron Patterson2011-07-203-1/+17
| |/ / |/| |
* | | this fixes a brittle test in fixtures_test.rb which fails when you are in a t...Josh Kalderimis2011-07-201-2/+2
* | | avoid Symbol#to_procVijay Dev2011-07-201-1/+1
* | | Explicitly require Active Support dependenciesNorman Clarke2011-07-191-0/+2
* | | ActiveRecord: Fix eager loading so that giving a blank order clause generates...Elliot Winkler2011-07-182-1/+13
* | | 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