aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Deprecate `false` as the way to halt AM validation callbacksclaudiob2015-01-023-6/+28
* Deprecate `false` as the way to halt AS callbacksclaudiob2015-01-024-4/+36
* Throw :abort halts default CallbackChainsclaudiob2015-01-027-14/+68
* Loosen test about order of initializersclaudiob2015-01-021-10/+5
* Merge pull request #18279 from eileencodes/refactor-association-scopeRafael Mendonça França2015-01-024-84/+169
|\
| * Cleanup methods, missing spacing and missing nodocseileencodes2015-01-022-33/+34
| * Move `#type_caster` to alias tracker initializeeileencodes2015-01-023-13/+10
| * Add `#all_includes` method to reflectionseileencodes2015-01-022-1/+5
| * Initialze `#alias_tracker` with base table nameeileencodes2015-01-023-11/+12
| * Move `alias_candiate` into `AbstractReflection`eileencodes2015-01-022-10/+16
| * Pass `connection` rather than `alias_tracker`eileencodes2015-01-022-7/+7
| * Assign the `#alias_name` to each reflectioneileencodes2015-01-022-18/+15
| * Clean up / refactor new reflection classeseileencodes2015-01-022-92/+76
| * Refactor `#get_chain` iteration to a linked listeileencodes2015-01-021-14/+21
| * Refactor `#get_chain` to remove need for `#construct_tables`eileencodes2015-01-021-14/+11
| * Move `#alias_name` to `ReflectionProxy` classeileencodes2015-01-022-20/+23
| * Clean up assignments in `#add_constraints`eileencodes2015-01-021-8/+3
| * Refactor construct_tables methodeileencodes2015-01-022-36/+20
| * Add RuntimeReflection for recursive access to chaineileencodes2015-01-021-3/+54
| * Add PolymorphicReflection and constraints methodeileencodes2015-01-022-4/+62
* | Merge pull request #9065 from atombender/masterRafael Mendonça França2015-01-022-1/+16
|\ \
| * | Fix TaggedLogging to allow loggers to be instantiated multiple times without ...Alexander Staubo2013-01-242-1/+16
* | | Deprecate `MissingSourceFile` in favor of `LoadError`.Rafael Mendonça França2015-01-024-4/+22
* | | Merge pull request #8740 from amatsuda/missing_source_fileRafael Mendonça França2015-01-023-27/+3
|\ \ \ | |_|/ |/| |
| * | replace use of MissingSourceFile with LoadErrorAkira Matsuda2013-01-043-19/+4
* | | Don't test invalid log encoding against PostgreSQL adapterRafael Mendonça França2015-01-021-4/+6
* | | A quick pass through NestedAttributes' doc [ci skip]Robin Dupret2015-01-021-18/+20
* | | Revert part of 996e646bd8cff3bcf2b13863439f48d3e744cdae [ci skip]Zachary Scott2015-01-022-3/+1
* | | Follow up to #17973 [ci skip]Robin Dupret2015-01-021-9/+10
* | | Merge pull request #17822 from kamipo/refactor_visit_change_column_definitionRafael Mendonça França2015-01-024-16/+14
|\ \ \
| * | | Refactor `visit_ChangeColumnDefinition`Ryuta Kamizono2015-01-032-11/+9
| * | | Add default value for `create_table_definition`Ryuta Kamizono2015-01-033-5/+5
* | | | Merge pull request #8547 from printercu/patch-1Rafael Mendonça França2015-01-022-1/+14
|\ \ \ \ | |/ / / |/| | |
| * | | fix for messages in invalid encoding from db-driversMax Melentiev2013-12-072-1/+14
* | | | Merge pull request #17820 from fw42/restore_query_cache_on_rollbackRafael Mendonça França2015-01-029-9/+53
|\ \ \ \
| * | | | Restore query cache on rollbackFlorian Weingarten2014-12-018-9/+49
* | | | | Merge pull request #15309 from iantropov/issue_12698_build_throughRafael Mendonça França2015-01-024-1/+29
|\ \ \ \ \
| * | | | | Add setting of FK for throgh associations while buildingIvan Antropov2014-05-254-1/+29
* | | | | | Merge pull request #17978 from kommen/fixed-pr-14903Rafael Mendonça França2015-01-023-4/+38
|\ \ \ \ \ \
| * | | | | | Ensure append_info_to_payload is called even if an exception is raised.Dieter Komendera2014-12-103-4/+38
* | | | | | | Merge pull request #17974 from killthekitten/fix-render-blockRafael Mendonça França2015-01-025-1/+49
|\ \ \ \ \ \ \
| * | | | | | | Make possible to use blocks with short version of render partialNikolay Shebanov2014-12-195-1/+49
* | | | | | | | Merge pull request #17973 from maurogeorge/file_field_hidden_fieldRafael Mendonça França2015-01-024-5/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a hidden_field on the file_fieldMauro George2015-01-024-5/+56
* | | | | | | | | Remove thread variables backportRafael Mendonça França2015-01-022-161/+0
* | | | | | | | | Merge pull request #18228 from kamipo/correctly_dump_primary_keyRafael Mendonça França2015-01-027-5/+69
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve a dump of the primary key support.Ryuta Kamizono2014-12-297-5/+69
* | | | | | | | | | Remove support to activerecord-deprecated_findersRafael Mendonça França2015-01-0216-130/+64
* | | | | | | | | | Merge pull request #16749 from robin850/rbx-name-errorRafael Mendonça França2015-01-021-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Skip an error message related assertion on RubiniusRobin Dupret2014-10-281-0/+2