Skip to content

Commit

Permalink
Avoid defining Hash#deep_merge and #deep_merge! (#342)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanhefner authored Oct 18, 2023
1 parent 432a6a0 commit 759c0fe
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 5.0.0

### BREAKING CHANGES

* `config` no longer loads `deep_merge`'s monkey patch for `Hash#deep_merge` and `Hash#deep_merge!` ([#342](https://github.com/rubyconfig/config/pull/342)). If you rely on those methods and are not using Rails / Active Support, you can load the monkey patch via `require 'deep_merge/deep_merge_hash'`.

## 4.2.1

### Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion lib/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
require 'config/sources/hash_source'
require 'config/sources/env_source'
require 'config/validation/schema'
require 'deep_merge'
require 'deep_merge/core'

module Config
extend Config::Validation::Schema
Expand Down

0 comments on commit 759c0fe

Please sign in to comment.