nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not use example config if there's a custom one

Browse source
This commit is contained in:
Jonne Haß 2011-12-22 02:01:17 +01:00
parent c258755af5
commit 2817fb95de
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/app_config.rb
View file

@ -6,11 +6,11 @@ require 'uri'
class AppConfig < Settingslogic class AppConfig < Settingslogic
def self.source_file_name def self.source_file_name
if Rails.env == 'test' || ENV["CI"] || Rails.env.include?("integration") || ENV["HEROKU"] config_file = File.join(Rails.root, "config", "application.yml")
File.join(Rails.root, "config", "application.yml.example") if !File.exists?(config_file) && (Rails.env == 'test' || Rails.env.include?("integration") || ENV["HEROKU"])
else config_file = File.join(Rails.root, "config", "application.yml.example")
File.join(Rails.root, "config", "application.yml")
end end
config_file
end end
source source_file_name source source_file_name
namespace Rails.env namespace Rails.env