diff options
| author | John Crepezzi <seejohnrun@github.com> | 2019-07-25 20:08:10 -0400 |
|---|---|---|
| committer | John Crepezzi <seejohnrun@github.com> | 2019-07-25 20:14:21 -0400 |
| commit | 5e260574a43d5c2fef8b170138baa9f7e10bfb24 (patch) | |
| tree | 6b3cf3dceafbb1bad11a651ef83e43c3ab06b199 /activerecord/lib/active_record/callbacks.rb | |
| parent | ec7aa03c984a0daeead4f71c7189d241139a6770 (diff) | |
| download | rails-5e260574a43d5c2fef8b170138baa9f7e10bfb24.tar.gz rails-5e260574a43d5c2fef8b170138baa9f7e10bfb24.tar.bz2 rails-5e260574a43d5c2fef8b170138baa9f7e10bfb24.zip | |
Only merge DATABASE_URL settings into the current env
This commit fixes a regression where when the `DATABASE_URL` environment
variable was set and the current Rails environment had a valid configuration
defined in the database config, settings from the environment variable would
affect _all_ environments (not just the current one).
Diffstat (limited to 'activerecord/lib/active_record/callbacks.rb')
0 files changed, 0 insertions, 0 deletions