Merge branch 'master' into more_powerful_fixity_service

samvera · May 4, 2017 · 8491899 · 8491899
2 parents b78c788 + 87deb35
commit 8491899
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/active_fedora/file_configurator.rb b/lib/active_fedora/file_configurator.rb
@@ -108,7 +108,7 @@ def load_fedora_config
       end
 
       begin
-        fedora_yml = YAML.safe_load(config_erb)
+        fedora_yml = YAML.safe_load(config_erb, [], [], true) # allow YAML aliases
       rescue Psych::SyntaxError => e
         raise "fedora.yml was found, but could not be parsed. " \
               "Error #{e.message}"
@@ -132,7 +132,7 @@ def load_solr_config
       end
 
       begin
-        solr_yml = YAML.safe_load(config_erb)
+        solr_yml = YAML.safe_load(config_erb, [], [], true) # allow YAML aliases
       rescue StandardError
         raise("solr.yml was found, but could not be parsed.\n")
       end