From fcd510ce376fe5e6657b54954ae917aa09f52740 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Mon, 15 Jan 2024 13:01:37 +0100
Subject: [PATCH] Avoid issues with potentially merging nil
---
app/models/foreman_passwordstate/passwordstate_host_facet.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/foreman_passwordstate/passwordstate_host_facet.rb b/app/models/foreman_passwordstate/passwordstate_host_facet.rb
index 54a6545..21d0186 100644
--- a/app/models/foreman_passwordstate/passwordstate_host_facet.rb
+++ b/app/models/foreman_passwordstate/passwordstate_host_facet.rb
@@ -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
--
GitLab