aboutsummaryrefslogtreecommitdiffstats
path: root/config/environment.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-10-11 15:17:09 +0100
committerLouise Crow <louise.crow@gmail.com>2012-10-11 15:17:09 +0100
commitfd461b18824bc5e22fd093ea4d53e74c7ada1721 (patch)
tree7647b73abe4d4c4405b08d3fdf7ac6f6bb2275bd /config/environment.rb
parente0e0542d17cba590218d1eed11b7997f29b46026 (diff)
parenta902a8308fe05e9fd7a61aa8378aaf95729fcc88 (diff)
Merge branch 'feature/ruby-19-compat-immediate' into develop
Diffstat (limited to 'config/environment.rb')
-rw-r--r--config/environment.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 3348ef92a..4ae3f26d9 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,9 @@
# Be sure to restart your web server when you modify this file.
+# the default encoding for IO is utf-8, and we use utf-8 internally
+if RUBY_VERSION.to_f >= 1.9
+ Encoding.default_external = Encoding.default_internal = Encoding::UTF_8
+end
# Uncomment below to force Rails into production mode when
# you don't control web/app server and can't set it the proper way