aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Fix destructive side effects from marshaling an association caused by 65843e1...Jeremy Kemper2012-09-252-7/+7
* Skip tests for non-supported isolation levelsYasuo Honda2012-09-261-2/+6
* Skip tests for non-supported isolation levels with OracleYasuo Honda2012-09-251-0/+2
* Merge pull request #6936 from jfoley/callbacksSantiago Pastorino2012-09-242-0/+53
|\
| * Add CHANGELOG entry and update the guideJohn Foley2012-09-231-0/+4
| * Fix collisions with before and after validation callbacks.John Foley2012-09-231-0/+49
* | make clear that expired db/schema_cache.dump are ignoredXavier Noria2012-09-241-1/+1
|/
* Fix test_find_in_batches_should_use_any_column_as_primary_keySantiago Pastorino2012-09-221-11/+8
* start could be a stringSantiago Pastorino2012-09-212-3/+3
* Revert "Fix find_in_batches with customized primary_key"Santiago Pastorino2012-09-214-28/+11
* Style: remove hash noiseJeremy Kemper2012-09-211-10/+10
* Correct default charset/collation for mysql dbsJeremy Kemper2012-09-212-15/+30
* Use default charset/collation only if *neither* is specified. Otherwise we se...Jeremy Kemper2012-09-211-4/+7
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-213-20/+28
|\
| * Add extra note about :dependent => :destroy.Steve Klabnik2012-09-211-1/+4
| * fix :nodoc:s in AR::Timestamp [ci skip]Francesco Rodriguez2012-09-191-7/+7
| * update code examples to 1.9 hash syntax in the AR/README [ci skip]Francesco Rodriguez2012-09-171-12/+12
| * Doc typo: depenent -> dependent; trailing ws.Henrik N2012-09-161-2/+2
| * Improve documentation about :dependent and callbacks.Steve Klabnik2012-09-151-0/+5
* | Make the serializable test much looserJon Leighton2012-09-211-18/+5
* | Support for specifying transaction isolation levelJon Leighton2012-09-219-15/+263
* | Merge pull request #5248 from jcoleman/should-unset-association-when-an-exist...Jon Leighton2012-09-212-0/+17
|\ \
| * | Unset association when existing record is destroyed.James Coleman2012-03-022-0/+17
* | | Get rid of global variable in AR transactions testCarlos Antonio da Silva2012-09-201-7/+7
* | | remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip]Francesco Rodriguez2012-09-201-7/+2
* | | rename AR::Model::Tag to AR::Tag - fixes #7714Francesco Rodriguez2012-09-206-14/+19
* | | Freeze columns only once per ResultSantiago Pastorino2012-09-201-6/+9
* | | Freeze columns just before using them as hash keysSantiago Pastorino2012-09-201-2/+5
* | | Merge pull request #7631 from jeremyevans/patch-1Aaron Patterson2012-09-191-1/+1
|\ \ \
| * | | Freeze columns before using them as hash keysJeremy Evans2012-09-131-1/+1
* | | | update AR::AttributeAssignment documentation [ci skip]Francesco Rodriguez2012-09-191-5/+5
* | | | Merge pull request #7710 from guilleiguaran/refactor-ar-attributes-methodRafael Mendonça França2012-09-191-10/+4
|\ \ \ \
| * | | | AR::Base#attributes= is just an alias for AR::Base#assign_attributesGuillermo Iguaran2012-09-191-10/+4
* | | | | Fix out-of-date URL.Alex Reisner2012-09-191-1/+1
* | | | | Update changelogs to add entries about strong_parameters integrationGuillermo Iguaran2012-09-191-0/+14
* | | | | Load the environment after creating the databaseJeremy Kemper2012-09-191-2/+2
* | | | | Revert "Make sure :environment task is executed before db:schema:load or db:s...Jeremy Kemper2012-09-191-2/+2
* | | | | Improve the CHANGELOG entry for #6971Rafael Mendonça França2012-09-191-1/+14
* | | | | fix querying with an empty hashDamien Mathieu2012-09-193-3/+18
* | | | | Remove unused private method AR::NestedAttributes#unassignable_keys and refer...Guillermo Iguaran2012-09-191-5/+1
|/ / / /
* | | | Update AR::Base.create and AR:Base#update_attributes docs to remove reference...Guillermo Iguaran2012-09-181-11/+0
* | | | Update docs for AR::Base#new to remove references to mass_assignment_optionsGuillermo Iguaran2012-09-181-10/+1
* | | | 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