diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-15 17:04:06 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-15 17:04:06 +1100 |
| commit | e6c80e93df44a436d9c94a9c076eb321df249b2a (patch) | |
| tree | f2396181cfadeca370446f936f0bc4c1da3888dd /config/environment.rb | |
| parent | b5f2bed1e406cd7fb6b50259a57be201c797db7d (diff) | |
| parent | 843805e5d92eded943bd2a32b02ac967539245e8 (diff) | |
Merge remote-tracking branch 'mysociety/develop' into rails_xss
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/environment.rb b/config/environment.rb index e79efdcfa..b32eeeb01 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 @@ -16,7 +18,7 @@ end # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |