From fae41abf5d0827f9b8031bb1362e86624541506d Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Sun, 4 Dec 2011 23:03:31 +0000
Subject: [PATCH] Update config defaults for new rails version

---
 config/application.rb                  | 2 +-
 config/environments/test.rb            | 3 ---
 config/initializers/wrap_parameters.rb | 2 +-
 script/rails                           | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 1e72cc3..76ae342 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,7 +16,7 @@ module Scube
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/lib)
+    # config.autoload_paths += %W(#{config.root}/extras)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 5ed01b1..bb52d28 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -36,7 +36,4 @@ Scube::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
 end
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index da4fb07..999df20 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  wrap_parameters format: [:json]
 end
 
 # Disable root element in JSON by default.
diff --git a/script/rails b/script/rails
index f138a34..f8da2cf 100755
--- a/script/rails
+++ b/script/rails
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 APP_PATH = File.expand_path('../../config/application',  __FILE__)