aboutsummaryrefslogtreecommitdiffstats
path: root/config/environment.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-01-15 15:19:05 +0000
committerLouise Crow <louise.crow@gmail.com>2013-01-15 15:19:05 +0000
commit5f3418307d6087f848eb1fdbf4531d67416121df (patch)
treecb7dad95b6b21db3b237efabc9d0fa37879adc10 /config/environment.rb
parent07121bf22b0929e03215f02b8740c3979ae6c872 (diff)
parent7cc8cae3a669fc5de91d6bc23812c265e8af4c93 (diff)
Merge branch 'release/0.6.9' into wdtk
Diffstat (limited to 'config/environment.rb')
-rw-r--r--config/environment.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 95f44984f..21415dfd8 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -9,6 +9,8 @@ if RUBY_VERSION.to_f >= 1.9
require 'active_support/inflector'
# Activate warning messages again.
$VERBOSE = original_verbose
+ require 'yaml'
+ YAML::ENGINE.yamler = "syck"
end
# Uncomment below to force Rails into production mode when
@@ -41,7 +43,7 @@ require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch')
require 'configuration'
# Application version
-ALAVETELI_VERSION = '0.6.8'
+ALAVETELI_VERSION = '0.6.9'
Rails::Initializer.run do |config|
# Load intial mySociety config