Skip to content

Avoid defining Hash#deep_merge and #deep_merge! #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pkuczynski merged 3 commits into from
Oct 18, 2023
Merged

Avoid defining Hash#deep_merge and #deep_merge! #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a0b7a5
Avoid defining Hash#deep_merge and #deep_merge!
jonathanhefner Oct 2, 2023
4a79eac
Merge branch 'master' into deep_merge-require-core-only
pkuczynski Oct 4, 2023
be234a9
Merge branch 'master' into deep_merge-require-core-only
pkuczynski Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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