Skip to content
Snippets Groups Projects
Verified Commit fcd510ce authored by Alexander Olofsson's avatar Alexander Olofsson
Browse files

Avoid issues with potentially merging nil

parent 3480e8cd
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,7 @@ module ForemanPasswordstate
# FOREMAN-37043
def self.inherited_attributes(hostgroup, facet_attributes)
facet_attributes.merge(super) { |_, left, right| left || right }
(facet_attributes || {}).merge(super) { |_, left, right| left || right }
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment