lib/taza/settings.rb in taza-0.9.2.1 vs lib/taza/settings.rb in taza-1.0

- old
+ new

@@ -21,10 +21,10 @@ def self.config_folder # :nodoc: File.join(path,'config') end def self.site_file(site_name) # :nodoc: - YAML.load_file(File.join(config_folder,"#{site_name.underscore}.yml"))[ENV['TAZA_ENV']] + YAML.load(ERB.new(File.read(File.join(config_folder,"#{site_name.underscore}.yml"))).result)[ENV['TAZA_ENV']] end def self.path # :nodoc: '.' end