aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into habtmAaron Patterson2013-10-029-53/+71
|\
| * we can define callbacks without a builder instanceAaron Patterson2013-10-024-9/+9
| * push methods that don't depend on the instance to the classAaron Patterson2013-10-022-6/+6
| * get the name from the reflectionAaron Patterson2013-10-021-1/+1
| * cache the name and options on the stackAaron Patterson2013-10-021-1/+3
| * decouple belongs_to callback definition from the builder instance.Aaron Patterson2013-10-021-4/+4
| * add_before_destroy_callbacks doesn't depend on the instance, so push itAaron Patterson2013-10-022-5/+5
| * valid_options doesn't depend on the instance, so push it to the classAaron Patterson2013-10-024-8/+8
| * use the information on the reflection to determine whether callbacks should b...Aaron Patterson2013-10-021-4/+5
| * association builder is no longer needed for counter cache, so remove itAaron Patterson2013-10-021-7/+6
| * push constructable? on to the reflectionAaron Patterson2013-10-025-18/+22
| * name is on the reflection, so just use the reflectionAaron Patterson2013-10-021-2/+2
| * decouple define_callback from the instanceAaron Patterson2013-10-021-2/+4
| * improving `reload` doc wording. #12418 [ci skip]Yves Senn2013-10-021-1/+2
| * Update AR reload doc for the case of manually set primary key attribute [ci s...Anatoli Makarevich2013-10-021-2/+11
* | move habtm translation to a builder classAaron Patterson2013-10-022-89/+116
* | get the left and right association names from the join modelAaron Patterson2013-10-021-8/+17
* | define the join model without using closures on the methodsAaron Patterson2013-10-021-18/+31
* | decouple the HABTM builderAaron Patterson2013-10-011-2/+31
* | only pass options to the habtm builderAaron Patterson2013-10-011-1/+1
* | Squashed commit of the following:Aaron Patterson2013-10-012-2/+91
|/
* extract adapter savepoint implementations into `abstract/savepoints.rb`.Yves Senn2013-09-306-46/+27
* change the savepoint interface to allow passing the name.Yves Senn2013-09-304-21/+21
* Merge pull request #12383 from marclennox/masterRafael Mendonça França2013-09-291-2/+2
|\
| * Fixed issue #12327Marc Lennox2013-09-271-2/+2
* | Merge pull request #12398 from thedarkone/thread-safety-stuffRafael Mendonça França2013-09-281-12/+8
|\ \
| * | Use TS::Cache instead of Mutex + Hash.thedarkone2013-09-281-12/+8
| |/
* | Merge pull request #11496 from jetthoughts/11376_has_many_assoc_respect_scope...Rafael Mendonça França2013-09-281-4/+0
|\ \
| * | Removed where_values_hash from AR::NullRelationPaul Nikitochkin2013-09-281-4/+0
| |/
* | Merge pull request #12396 from arthurnn/cleanup_logsubsRafael Mendonça França2013-09-281-11/+2
|\ \
| * | Cleanup identitymap logger from LogSubscriberArthur Neves2013-09-281-11/+2
| |/
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-281-1/+1
|\ \ | |/ |/|
| * `skiping` => `skipping`Vipul A M2013-09-171-1/+1
* | fix .find when inverse is setArthur Neves2013-09-251-5/+4
* | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-251-0/+1
|\ \
| * | Make sure inverse_of is visible on the has_many callbacksArthur Neves2013-09-251-0/+1
* | | Merge branch 'master' into preloadAaron Patterson2013-09-259-29/+58
|\| |
| * | Merge pull request #12290 from kennyj/fix_12278Andrew White2013-09-241-3/+11
| |\ \
| | * | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects strin...kennyj2013-09-251-3/+11
| * | | assign_attributes should return if argument is blank.wangjohn2013-09-241-0/+1
| |/ /
| * | Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nilRafael Mendonça França2013-09-241-1/+3
| |\ \
| | * | Raising an error when nil or non-hash is passed to update_attributes.wangjohn2013-06-251-1/+3
| * | | Deprecate unused quoted_locking_column method.kennyj2013-09-241-0/+1
| * | | Merge pull request #11987 from wangjohn/schema_dumper_optionsRafael Mendonça França2013-09-231-5/+16
| |\ \ \
| | * | | Creating options for schema dumper.wangjohn2013-08-221-5/+16
| * | | | Merge pull request #10816 from bogdan/less-dirty-dirtyRafael Mendonça França2013-09-233-13/+8
| * | | | Merge pull request #11382 from kennyj/fix_10751-2Rafael Mendonça França2013-09-221-3/+6
| |\ \ \ \
| | * | | | Migration dump UUID default functions to schema.rb. Fixes #10751.kennyj2013-07-101-3/+6
| * | | | | Merge pull request #10500 from kennyj/fix_10450Rafael Mendonça França2013-09-221-3/+3
| |\ \ \ \ \
| | * | | | | Fixed a bug in when using has_many association with :inverse_of option and U...kennyj2013-05-081-3/+3