Merge pull request #42249 from byroot/psych-4-support

Fix compatibility with Psych 4

activesupport/lib/active_support/configuration_file.rb

@@ -19,7 +19,12 @@ module ActiveSupport
     end
 
     def parse(context: nil, **options)
-      YAML.load(render(context), **options) || {}
+      source = render(context)
+      begin
+        YAML.load(source, aliases: true, **options) || {}
+      rescue ArgumentError
+        YAML.load(source, **options) || {}
+      end
     rescue Psych::SyntaxError => error
       raise "YAML syntax error occurred while parsing #{@content_path}. " \
             "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \