Skip to content

Commit

Permalink
Solve HashDiff gem conflicts
Browse files Browse the repository at this point in the history
The HashDiff constant used by this gem conflicts
with another gem of a similar name.
As of version 1.0 the HashDiff constant will
be completely removed and replaced by Hashdiff.

For more information see liufengyun/hashdiff#45.
  • Loading branch information
Octavian Neguletu committed Sep 2, 2019
1 parent c8c1b53 commit 0bbb0ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Gemfile
Expand Up @@ -52,6 +52,9 @@ gem 'wombat', '~> 2.8'
gem 'flipflop', '~> 2.6'
gem 'splitclient-rb', '~> 6.4'

# Hashdiff is a ruby library to compute the smallest difference between two hashes.
gem 'hashdiff', '~> 1.0'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: %i[mri mingw x64_mingw]
Expand Down
3 changes: 2 additions & 1 deletion Gemfile.lock
Expand Up @@ -173,7 +173,7 @@ GEM
has_scope (0.7.2)
actionpack (>= 4.1)
activesupport (>= 4.1)
hashdiff (0.4.0)
hashdiff (1.0.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.6.0)
Expand Down Expand Up @@ -466,6 +466,7 @@ DEPENDENCIES
foreman
geocoder (~> 1.5, >= 1.5.1)
govuk-lint
hashdiff (~> 1.0)
kaminari (~> 1.1, >= 1.1.1)
listen (>= 3.0.5, < 3.2)
logglier (~> 0.5)
Expand Down

0 comments on commit 0bbb0ed

Please sign in to comment.