Revert "Revert "Use ActiveSupport Hash#deep_merge" (#111)"

[iMichka]

This reverts commit 3135c0d.

[sjackman]

Is this PR still needed?

[iMichka]

Not having this is fine, because the current code works. But we want to stay aligned with upstream.

[sjackman]

Oh, I see. This PR reverts the revert. I had missed that.

[iMichka]

Looks like this broke the bottle upload:

{"CIRCLE_PR_NUMBER"=>"9634"} /tmp/brew/bin/brew test-bot --ci-upload --bintray-org=linuxbrew --git-name=LinuxbrewTestBot --git-email=testbot@linuxbrew.sh --keep-old
Homebrew/homebrew-test-bot 
ARGV: --ci-upload --bintray-org=linuxbrew --git-name=LinuxbrewTestBot --git-email=testbot@linuxbrew.sh --keep-old
Error: undefined method `deep_merge' for {}:Hash
Did you mean?  deep_merge_hashes
/tmp/brew/Library/Taps/linuxbrew/homebrew-test-bot/cmd/brew-test-bot.rb:1370:in `block in test_ci_upload'

[maxim-belkin]

Sounds like a job for a "revert revert revert"...?

[iMichka]

That's the quick-fix, yes.

The change comes due to: Homebrew/brew#4912

Looks like global.rb requires "active_support/core_ext/hash/deep_merge"`. Maybe this is not loaded on our test bot

[sjackman]

I've redeployed bot.linuxbrew.sh

[iMichka]

That worked!