aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7251 from rails/integrate-strong_parametersDavid Heinemeier Hansson2012-09-1831-1320/+133
|\
| * Set primary key with id= only if primary key existsGuillermo Iguaran2012-09-161-1/+1
| * Remove mass_assignment_options from ActiveRecordGuillermo Iguaran2012-09-1618-162/+66
| * attr_accessible and attr_protected raise an exception pointing to use plugin ...Guillermo Iguaran2012-09-161-0/+2
| * Don't use assert_nothing_raised when assert_equal is usedGuillermo Iguaran2012-09-161-10/+6
| * Rename ForbiddenAttributes exception to ForbiddenAttributesErrorGuillermo Iguaran2012-09-162-2/+2
| * Add tests for ForbiddenAttributesProtection in ActiveRecordGuillermo Iguaran2012-09-161-0/+63
| * Remove mass assignment security from ActiveRecordGuillermo Iguaran2012-09-1620-1170/+18
* | ActiveRecord -> Active RecordXavier Noria2012-09-181-1/+1
* | Use the CHANGELOG convention [ci skip]Rafael Mendonça França2012-09-171-3/+5
* | Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmtRafael Mendonça França2012-09-173-0/+24
|\ \
| * | Fix collection= on hm:t join models when unsavedErnie Miller2012-09-173-0/+24
* | | Fix warning: method redefine. Testcase name are duplicated.kennyj2012-09-171-1/+1
| |/ |/|
* | improve AR/CHANGELOG [ci skip]Francesco Rodriguez2012-09-161-44/+68
* | Merge pull request #7547 from danmcclain/pg-arraysRafael Mendonça França2012-09-1612-53/+435
|\ \
| * | Moves column dump specific code to a module included in AbstractAdapterDan McClain2012-09-1412-53/+435
* | | Remove debug code :bomb:Rafael Mendonça França2012-09-161-1/+0
* | | Merge pull request #7651 from steveklabnik/issue_3956Rafael Mendonça França2012-09-162-2/+33
|\ \ \ | |_|/ |/| |
| * | Don't preserve SELECT columns on COUNTSteve Klabnik2012-09-162-2/+33
* | | Don't explain except normal CRUD sql.kennyj2012-09-173-1/+14
* | | Fix find_in_batches with customized primary_keyToshiyuki Kawanishi2012-09-164-6/+38
* | | Query for sequence info also should be markd as SCHEMA.kennyj2012-09-151-3/+3
* | | Query for loading index info should be marked as SCHEMA.kennyj2012-09-152-2/+2
* | | Merge pull request #7643 from steveklabnik/deprecate_silenceRafael Mendonça França2012-09-151-12/+18
|\ \ \
| * | | Deprecate ActiveSupport::Benchmarkable#silence.Steve Klabnik2012-09-151-12/+18
| | |/ | |/|
* | | simplify rescueJon Leighton2012-09-151-3/+3
| |/ |/|
* | Fix testJon Leighton2012-09-152-15/+21
* | Ensure disconnecting or reconnecting resets the transaction stateJon Leighton2012-09-157-9/+55
* | Remove our use of #outside_transaction?Jon Leighton2012-09-153-61/+17
* | Remove the transaction_open variableJon Leighton2012-09-152-21/+33
* | Move transaction joinability into the transaction objectJon Leighton2012-09-155-20/+36
* | Alter the naming structure a bitJon Leighton2012-09-153-108/+111
* | Split Open into Real and SavepointJon Leighton2012-09-151-25/+38
* | DRYJon Leighton2012-09-151-4/+8
* | Don't do the rollback in #commitJon Leighton2012-09-152-18/+7
* | Store the transaction number in the transaction objectJon Leighton2012-09-155-13/+30
* | Start to tease out transaction handling into a state machineJon Leighton2012-09-156-87/+158
* | Revert "create a transaction object and point AR objects at that object durin...Jon Leighton2012-09-154-55/+12
|/
* refactor store_accessorMatt Jones2012-09-134-9/+67
* update ConnectionAdaptar::Column#type_cast_code to be compatible with 3.2 branchThiago Pradi2012-09-131-1/+1
* Pass in the model class rather than engineJon Leighton2012-09-133-8/+8
* Refactor to remove some duplicationJon Leighton2012-09-122-37/+24
* Fix nested association referencesJon Leighton2012-09-123-41/+36
* Merge pull request #7273 from beerlington/foreign_key_model_queriesJon Leighton2012-09-126-5/+151
|\
| * Accept belongs_to assoc. keys in ActiveRecord queriesbeerlington2012-09-116-5/+151
* | Update documentation for CollectionProxyMarc-Andre Lafortune2012-09-121-8/+2
* | Merge pull request #7605 from revans/masterCarlos Antonio da Silva2012-09-121-1/+11
|\ \
| * | Added additional comments on how to use the "type" column withoutRobert Evans2012-09-121-1/+11
* | | Merge pull request #7521 from graceliu/fix_database_url_supportRafael Mendonça França2012-09-124-32/+60
|\ \ \
| * | | fixed support for DATABASE_URL for rake db tasksGrace Liu2012-09-114-32/+60