diff options
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index d3e4742e8a..f9f47ef679 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -6,21 +6,29 @@ module Rails include ::Rails::Configuration::Deprecated attr_accessor :allow_concurrency, :cache_classes, :cache_store, - :secret_token, :consider_all_requests_local, :dependency_loading, + :encoding, :consider_all_requests_local, :dependency_loading, :filter_parameters, :log_level, :logger, :metals, :plugins, :preload_frameworks, :reload_engines, :reload_plugins, - :serve_static_assets, :time_zone, :whiny_nils + :secret_token, :serve_static_assets, :time_zone, :whiny_nils def initialize(*) super - @allow_concurrency = false - @filter_parameters = [] - @dependency_loading = true + @allow_concurrency = false + @consider_all_requests_local = false + @encoding = "utf-8" + @filter_parameters = [] + @dependency_loading = true @serve_static_assets = true - @time_zone = "UTC" - @consider_all_requests_local = true @session_store = :cookie_store @session_options = {} + @time_zone = "UTC" + end + + def encoding=(value) + @encoding = value + if defined?(Encoding) && Encoding.respond_to?(:default_external=) + Encoding.default_external = value + end end def middleware |