From b6b336d9f96c0618885b587ebb2b4d85a9381afb Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 11 Jul 2013 17:01:02 -0700
Subject: config - add force_ssl to config, add configuration notes to
 README.md

---
 core/config/initializers/load_config.rb | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 core/config/initializers/load_config.rb

(limited to 'core')

diff --git a/core/config/initializers/load_config.rb b/core/config/initializers/load_config.rb
deleted file mode 100644
index b2b0318..0000000
--- a/core/config/initializers/load_config.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-def load_config_file(file)
-  File.exists?(file) ? YAML.load_file(file)[Rails.env] : {}
-end
-
-defaults = load_config_file("#{Rails.root}/config/defaults.yml") || {}
-config = load_config_file("#{Rails.root}/config/config.yml") || {}
-APP_CONFIG = defaults.merge(config).with_indifferent_access
-- 
cgit v1.2.3