From 95753fcd8cdab556686505b842aba01f0b3a23da Mon Sep 17 00:00:00 2001 From: melnikaite Date: Wed, 6 Apr 2016 15:42:43 +0300 Subject: [PATCH] Update jbuilder.rb --- lib/jbuilder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jbuilder.rb b/lib/jbuilder.rb index c3305328..9bb0a392 100644 --- a/lib/jbuilder.rb +++ b/lib/jbuilder.rb @@ -275,7 +275,7 @@ def _merge_values(current_value, updates) elsif ::Array === updates ::Array === current_value ? current_value + updates : updates elsif ::Hash === current_value - current_value.merge(updates) + current_value.deep_merge(updates) else raise "Can't merge #{updates.inspect} with #{current_value.inspect}" end