Ruby1.9: move setting Encoding.default_external after boot (#4050, #4796)

"ruby test/functional/repositories_git_controller_test.rb" fails
on Japanese Windows and Mingw Ruby 1.9.3p0
because "Rails" is not defined.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8833 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/environment.rb b/config/environment.rb
index 84178eab6e896438aa1988b2e2c9eb7d5f8b57cc..27f6972ea5f3877c66bde41e8121a7f1a5648940 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -7,13 +7,13 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
 
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
+
 if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3
   Encoding.default_external = 'UTF-8'
 end
 
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
 # Load Engine plugin if available
 begin
   require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')