Style

rails · Jan 22, 2021 · 0bbc365 · 0bbc365
1 parent 469a530
commit 0bbc365
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/lib/jbuilder.rb b/lib/jbuilder.rb
@@ -242,14 +242,8 @@ def attributes!
   end
 
   # Merges hash, array, or Jbuilder instance into current builder.
-  def merge!(obj)
-    hash_or_array =
-      if ::Jbuilder === obj
-        obj.attributes!
-      else
-        obj
-      end
-
+  def merge!(object)
+    hash_or_array = ::Jbuilder === object ? object.attributes! : object
     @attributes = _merge_values(@attributes, hash_or_array)
   end