1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/activerecord/test
Sean Griffin 5c32f41d52 Fix merge conflicts for #19938
This is a separate commit, as it is not just a changelog conflict. Want
to point out the changes in the code
2015-10-20 16:57:47 -06:00
..
active_record/connection_adapters introduce conn.data_source_exists? and conn.data_sources. 2015-09-22 19:48:44 +02:00
assets
cases Fix merge conflicts for #19938 2015-10-20 16:57:47 -06:00
fixtures Merge pull request #20574 from repinel/fix-db-fixtures-load 2015-09-30 11:06:41 +02:00
migrations
models Fix merge conflicts for #19938 2015-10-20 16:57:47 -06:00
schema Fix merge conflicts for #19938 2015-10-20 16:57:47 -06:00
support use correct DB connection for generated HABTM table 2015-08-07 12:33:09 -07:00
.gitignore
config.example.yml
config.rb