aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/environments/environment.rb4
-rwxr-xr-xrailties/fresh_rakefile4
-rw-r--r--railties/lib/initializer.rb2
3 files changed, 7 insertions, 3 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 6e2c616032..69951abee6 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -4,4 +4,6 @@ require File.join(File.dirname(__FILE__), 'boot')
Rails::Initializer.run do |config|
# See Rails::Configuration for options
-end \ No newline at end of file
+end
+
+# Include your application configuration below \ No newline at end of file
diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile
index 1a0c6bee61..02189e151a 100755
--- a/railties/fresh_rakefile
+++ b/railties/fresh_rakefile
@@ -1,5 +1,5 @@
-# Add your own tasks in files placed in config/tasks
-# and they will automatically be available to Rake.
+# Add your own tasks in files placed in config/tasks ending in .rake,
+# for example config/tasks/switchtower.rake, and they will automatically be available to Rake.
require(File.join(File.dirname(__FILE__), 'config', 'boot'))
Rails::Initializer.run(:set_load_path)
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index f54fb1aed3..37669adb42 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -73,7 +73,9 @@ module Rails
)
end
+ old_verbose, $VERBOSE = $VERBOSE, nil
Object.const_set "RAILS_DEFAULT_LOGGER", logger
+ $VERBOSE = old_verbose
end
def initialize_framework_logging