From 2817fb95defba736757ad4bf3597dd769617c24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 22 Dec 2011 02:01:17 +0100 Subject: [PATCH] do not use example config if there's a custom one --- app/models/app_config.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/app_config.rb b/app/models/app_config.rb index cdef7dc52..4ecb6254c 100644 --- a/app/models/app_config.rb +++ b/app/models/app_config.rb @@ -6,11 +6,11 @@ require 'uri' class AppConfig < Settingslogic def self.source_file_name - if Rails.env == 'test' || ENV["CI"] || Rails.env.include?("integration") || ENV["HEROKU"] - File.join(Rails.root, "config", "application.yml.example") - else - File.join(Rails.root, "config", "application.yml") + config_file = File.join(Rails.root, "config", "application.yml") + if !File.exists?(config_file) && (Rails.env == 'test' || Rails.env.include?("integration") || ENV["HEROKU"]) + config_file = File.join(Rails.root, "config", "application.yml.example") end + config_file end source source_file_name namespace Rails.env