0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Add config.active_support for future configuration options.  Also, add more new Rails 3 config settings to new_rails_defaults.rb [rick]
0
+
0
 * Add Rails.logger, Rails.root, Rails.env and Rails.cache shortcuts for RAILS_* constants [pratik]
0
 
0
 * Allow files in plugins to be reloaded like the rest of the application.  [rick]

0
@@ -3,3 +3,9 @@
0
 
0
 # Only save the attributes that have changed since the record was loaded.
0
 ActiveRecord::Base.partial_updates = true
0
+
0
+# Include ActiveRecord class name as root for JSON serialized output.
0
+ActiveRecord::Base.include_root_in_json = true
0
+
0
+# Use ISO 8601 format for JSON serialized times and dates
0
+ActiveSupport.use_standard_json_time_format = true
0
\ No newline at end of file

0
@@ -416,6 +416,9 @@ module Rails
0
           base_class.send("#{setting}=", value)
0
         end
0
       end
0
+      configuration.active_support.each do |setting, value|
0
+        ActiveSupport.send("#{setting}=", value)
0
+      end
0
     end
0
 
0
     # Fires the user-supplied after_initialize block (Configuration#after_initialize)
0
@@ -461,6 +464,9 @@ module Rails
0
     # A stub for setting options on ActiveRecord::Base
0
     attr_accessor :active_resource
0
 
0
+    # A stub for setting optinos on ActiveSupport
0
+    attr_accessor :active_support
0
+
0
     # Whether or not classes should be cached (set to false if you want
0
     # application classes to be reloaded on each request)
0
     attr_accessor :cache_classes
0
@@ -609,6 +615,7 @@ module Rails
0
       for framework in default_frameworks
0
         self.send("#{framework}=", Rails::OrderedOptions.new)
0
       end
0
+      self.active_support = Rails::OrderedOptions.new
0
     end
0
 
0
     # Set the root_path to RAILS_ROOT and canonicalize it.