From f037d594d11c1ceac7e8edd55e505ecd109d4330 Mon Sep 17 00:00:00 2001
From: Bryan Marble <bryan.marble@gmail.com>
Date: Fri, 15 Apr 2022 12:56:28 -0400
Subject: [PATCH] Support psych 4+. Go back to upstream when
 https://github.com/cschiewek/devise_ldap_authenticatable/pull/276

is merged.
---
 lib/devise_ldap_authenticatable/ldap/connection.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/devise_ldap_authenticatable/ldap/connection.rb b/lib/devise_ldap_authenticatable/ldap/connection.rb
index faefa574cc..072545a4fd 100644
--- a/lib/devise_ldap_authenticatable/ldap/connection.rb
+++ b/lib/devise_ldap_authenticatable/ldap/connection.rb
@@ -7,7 +7,12 @@ def initialize(params = {})
         if ::Devise.ldap_config.is_a?(Proc)
           ldap_config = ::Devise.ldap_config.call
         else
-          ldap_config = YAML.load(ERB.new(File.read(::Devise.ldap_config || "#{Rails.root}/config/ldap.yml")).result)[Rails.env]
+          source = ERB.new(File.read(::Devise.ldap_config || "#{Rails.root}/config/ldap.yml")).result
+          begin
+            ldap_config = YAML.load(source, aliases: true)[Rails.env]
+          rescue ArgumentError
+            ldap_config = YAML.load(source)[Rails.env]
+          end
         end
         ldap_options = params