aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-05-141-1/+4
|\
| * Move comment up to the class, for both of the methods, and document on class ...Vipul A M2016-05-011-1/+4
* | Add missing space and newline for clarityKang-Kyu Lee2016-05-121-3/+3
* | Give more context from `AssociationMismatchError`Sean Griffin2016-05-122-2/+3
* | Rename test methodMolchanov Andrey2016-05-121-1/+1
* | Fix false positive mutation detection when JSON is used with serializeSean Griffin2016-05-122-1/+40
* | Merge pull request #24980 from merhard/virtual-attribute-defaultSean Griffin2016-05-112-1/+10
|\ \
| * | Define ActiveRecord::Attribute::Null#type_castMatthew Erhard2016-05-112-1/+10
* | | remove_connection should not remove parent connectionArthur Neves2016-05-112-1/+9
|/ /
* | Merge pull request #24971 from arthurnn/arthurnn/dont_cache_specification_nameArthur Nogueira Neves2016-05-112-2/+11
|\ \
| * | Dont cache the conn_spec_name when emptyArthur Neves2016-05-112-2/+11
* | | Set conn_spec_name after removeArthur Neves2016-05-111-2/+2
|/ /
* | [ci skip] Update documents of `ConnectionHandler`yui-knk2016-05-111-3/+1
* | Make sure we reset the connection_specification_name onArthur Neves2016-05-102-1/+22
* | Merge pull request #24950 from kamipo/should_quote_lock_nameRafael França2016-05-102-5/+5
|\ \
| * | Should quote `lock_name` to pass to `get_advisory_lock`Ryuta Kamizono2016-05-102-5/+5
* | | Merge pull request #24939 from Neodelf/again_with_loopXavier Noria2016-05-101-2/+1
|\ \ \ | |/ / |/| |
| * | Replacement cycle for readabilityMolchanov Andrey2016-05-101-2/+1
* | | Add migration compatibility class for Rails 5.1Rafael Mendonça França2016-05-101-1/+4
* | | Start Rails 5.1 development :tada:Rafael Mendonça França2016-05-102-2116/+3
|/ /
* | Replacement cycle for readabilityMolchanov Andrey2016-05-091-2/+2
* | Followup to #24844Jon Moss2016-05-072-3/+4
* | Preparing for 5.0.0.rc1 releaseRafael Mendonça França2016-05-062-1/+6
* | Merge pull request #24844 from arthurnn/arthurnn/connArthur Nogueira Neves2016-05-0611-92/+109
|\ \
| * | Update docs for connection handlerArthur Neves2016-05-061-2/+5
| * | s/specification_name/connection_specification_nameArthur Neves2016-05-064-14/+14
| * | s/specification_id/specification_nameArthur Neves2016-05-058-48/+48
| * | Retrive the right pool for db tasksArthur Neves2016-05-051-2/+2
| * | inline retrive_conn_pool methodArthur Neves2016-05-051-12/+8
| * | Better code readabilityArthur Neves2016-05-052-4/+2
| * | Test to swap connection at runtimeArthur Neves2016-05-051-0/+7
| * | fix testArthur Neves2016-05-051-8/+7
| * | Add spec_id testsArthur Neves2016-05-051-0/+9
| * | Use spec key, when given as spec_idArthur Neves2016-05-052-20/+23
| * | Better specification_id methodArthur Neves2016-05-051-10/+7
| * | Rename methodArthur Neves2016-05-051-3/+3
| * | Refactor connection handlerArthur Neves2016-05-059-83/+88
* | | Merge pull request #24871 from vipulnsward/disable-transaction-failureArthur Nogueira Neves2016-05-061-0/+2
|\ \ \
| * | | We are erroring due to nested transaction failures from mysql on test_migrate...Vipul A M2016-05-061-0/+2
* | | | Allow the connection adapters to determine the order of bind paramsSean Griffin2016-05-063-4/+46
|/ / /
* | | Merge pull request #24869 from vipulnsward/change-exampleRafael França2016-05-051-3/+3
|\ \ \
| * | | Change to use a more realistic example and not giving the impression that des...Vipul A M2016-05-051-3/+3
* | | | Merge pull request #24868 from vipulnsward/delegate_encode_withRafael França2016-05-051-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | delegate encode_with instead of to_yaml, which is deprecatedVipul A M2016-05-051-1/+1
* | | | [ci skip] Don't promote SQL interpolation.Kasper Timm Hansen2016-05-051-2/+2
* | | | Merge pull request #24859 from y-yagi/do_not_pass_conditon_to_destroy_allVipul A M2016-05-052-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | do not pass conditions to `#destroy_all` [ci skip]yuuji.yaginuma2016-05-052-3/+3
| |/ /
* / / Fix some typos in comments.Joe Rafaniello2016-05-043-3/+3
|/ /
* | Followup of #24835Vipul A M2016-05-033-5/+5
* | Merge pull request #24833 from Erol/fix-typoप्रथमेश Sonpatki2016-05-031-1/+1
|\ \