Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Haß <me@mrzyx.de>2012-09-16 05:55:30 +0400
committerJonne Haß <me@mrzyx.de>2012-09-26 22:19:37 +0400
commit2a4db54db97e259de4711d3e25326ee1a4822727 (patch)
tree82e98275b76cea03da831e7698ee0969e4060920 /config/environment.rb
parent5bea63091034e208d3c6da35cbf9a41641f1e333 (diff)
New configuration system
* Throw away old system * Add new system * Add new example files * Replace all calls * add the most important docs * Add Specs * rename disable_ssl_requirement to require_ssl * cloudfiles isn't used/called in our code * since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it * die if session secret is unset and on heroku * First basic infrastructure for version information
Diffstat (limited to 'config/environment.rb')
-rw-r--r--config/environment.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/environment.rb b/config/environment.rb
index c55253105..690a781dc 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -13,7 +13,10 @@ end
# Load the rails application
require File.expand_path('../application', __FILE__)
-require File.join(Rails.root, "lib", "exceptions")
+require Rails.root.join("lib", "exceptions")
+
+# Load configuration system early
+require Rails.root.join("config", "load_config")
Haml::Template.options[:format] = :html5
Haml::Template.options[:escape_html] = true