diff options
Diffstat (limited to 'railties')
23 files changed, 14 insertions, 10 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 5ff1867568..6df7c568dc 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Turn cache_classes on by default [Josh Peek] + * Added configurable eager load paths. Defaults to app/models, app/controllers, and app/helpers [Josh Peek] * Introduce simple internationalization support. [Ruby i18n team] diff --git a/railties/bin/about b/railties/bin/about index ed8deb0dfc..ed8deb0dfc 100644..100755 --- a/railties/bin/about +++ b/railties/bin/about diff --git a/railties/bin/console b/railties/bin/console index 498077ab33..498077ab33 100644..100755 --- a/railties/bin/console +++ b/railties/bin/console diff --git a/railties/bin/destroy b/railties/bin/destroy index a4df765a39..a4df765a39 100644..100755 --- a/railties/bin/destroy +++ b/railties/bin/destroy diff --git a/railties/bin/generate b/railties/bin/generate index 173a9f147d..173a9f147d 100644..100755 --- a/railties/bin/generate +++ b/railties/bin/generate diff --git a/railties/bin/performance/benchmarker b/railties/bin/performance/benchmarker index c842d35d33..c842d35d33 100644..100755 --- a/railties/bin/performance/benchmarker +++ b/railties/bin/performance/benchmarker diff --git a/railties/bin/performance/profiler b/railties/bin/performance/profiler index d855ac8b13..d855ac8b13 100644..100755 --- a/railties/bin/performance/profiler +++ b/railties/bin/performance/profiler diff --git a/railties/bin/performance/request b/railties/bin/performance/request index ae3f38c74b..ae3f38c74b 100644..100755 --- a/railties/bin/performance/request +++ b/railties/bin/performance/request diff --git a/railties/bin/plugin b/railties/bin/plugin index 87cd2070fe..87cd2070fe 100644..100755 --- a/railties/bin/plugin +++ b/railties/bin/plugin diff --git a/railties/bin/process/inspector b/railties/bin/process/inspector index bf25ad86d1..bf25ad86d1 100644..100755 --- a/railties/bin/process/inspector +++ b/railties/bin/process/inspector diff --git a/railties/bin/process/reaper b/railties/bin/process/reaper index c77f04535f..c77f04535f 100644..100755 --- a/railties/bin/process/reaper +++ b/railties/bin/process/reaper diff --git a/railties/bin/process/spawner b/railties/bin/process/spawner index 7118f3983c..7118f3983c 100644..100755 --- a/railties/bin/process/spawner +++ b/railties/bin/process/spawner diff --git a/railties/bin/runner b/railties/bin/runner index a4a7cb25ba..a4a7cb25ba 100644..100755 --- a/railties/bin/runner +++ b/railties/bin/runner diff --git a/railties/bin/server b/railties/bin/server index 3c67f39b69..3c67f39b69 100644..100755 --- a/railties/bin/server +++ b/railties/bin/server diff --git a/railties/configs/apache.conf b/railties/configs/apache.conf index d9d211c058..d9d211c058 100755..100644 --- a/railties/configs/apache.conf +++ b/railties/configs/apache.conf diff --git a/railties/dispatches/dispatch.fcgi b/railties/dispatches/dispatch.fcgi index 65188f380b..664dbbbee8 100755 --- a/railties/dispatches/dispatch.fcgi +++ b/railties/dispatches/dispatch.fcgi @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/env ruby # # You may specify the path to the FastCGI crash log (a log of unhandled # exceptions which forced the FastCGI instance to exit, great for debugging) diff --git a/railties/dispatches/dispatch.rb b/railties/dispatches/dispatch.rb index 9b5ae760ff..32fa3b2665 100755 --- a/railties/dispatches/dispatch.rb +++ b/railties/dispatches/dispatch.rb @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/env ruby require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT) @@ -7,4 +7,4 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ require "dispatcher" ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun) -Dispatcher.dispatch
\ No newline at end of file +Dispatcher.dispatch diff --git a/railties/dispatches/gateway.cgi b/railties/dispatches/gateway.cgi index fb1fa22f04..0305b7f810 100644..100755 --- a/railties/dispatches/gateway.cgi +++ b/railties/dispatches/gateway.cgi @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/env ruby require 'drb' @@ -94,4 +94,4 @@ end $stdout.write output $stdout.flush -$stdout.close
\ No newline at end of file +$stdout.close diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb index 17acb7b68f..442526ae32 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/commands/dbconsole.rb @@ -41,6 +41,8 @@ when "mysql" if config['password'] && include_password args << "--password=#{config['password']}" + elsif config['password'] && !config['password'].empty? + args << "-p" end args << config['database'] diff --git a/railties/lib/commands/ncgi/listener b/railties/lib/commands/ncgi/listener index 421c453f23..7079ef78a6 100644..100755 --- a/railties/lib/commands/ncgi/listener +++ b/railties/lib/commands/ncgi/listener @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/env ruby require 'stringio' require 'fileutils' @@ -83,4 +83,4 @@ end socket_path = ARGV.shift timeout = (ARGV.shift || 90).to_i -Listener.new(timeout, socket_path)
\ No newline at end of file +Listener.new(timeout, socket_path) diff --git a/railties/lib/commands/ncgi/tracker b/railties/lib/commands/ncgi/tracker index 859c9fa0e0..4ca12d779b 100644..100755 --- a/railties/lib/commands/ncgi/tracker +++ b/railties/lib/commands/ncgi/tracker @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/env ruby require 'drb' require 'thread' @@ -66,4 +66,4 @@ end socket_path = ARGV.shift instances = ARGV.shift.to_i t = Tracker.new(instances, socket_path) -t.background(ARGV.first ? ARGV.shift.to_i : 90)
\ No newline at end of file +t.background(ARGV.first ? ARGV.shift.to_i : 90) diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 611e348acb..a2d08e2938 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -904,7 +904,7 @@ Run `rake gems:install` to install the missing gems. end def default_cache_classes - false + true end def default_whiny_nils diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile b/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile index 1824fb10fe..1824fb10fe 100755..100644 --- a/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile +++ b/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile |