diff options
| author | zhengjia <jiazheng@live.com> | 2010-10-26 22:13:12 -0500 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-11-11 17:29:39 +0100 |
| commit | 8a6ac4fc26bacbd2a6c978cace156e300b77508e (patch) | |
| tree | 09a6f2ff6e05997f70b57373e9bc066de574f1d3 | |
| parent | 793967cd404c839c1af8b3ef847dc1725a1fb7c6 (diff) | |
| download | rails-8a6ac4fc26bacbd2a6c978cace156e300b77508e.tar.gz rails-8a6ac4fc26bacbd2a6c978cace156e300b77508e.tar.bz2 rails-8a6ac4fc26bacbd2a6c978cace156e300b77508e.zip | |
Remove unused Configurable in Rails::Engine and Rails::Application. Remove unnecessary railties load path in cli [#5871 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
| -rw-r--r-- | railties/lib/rails/application.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/cli.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/engine.rb | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index d84373cddf..182068071d 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -35,7 +35,6 @@ module Rails # class Application < Engine autoload :Bootstrap, 'rails/application/bootstrap' - autoload :Configurable, 'rails/application/configurable' autoload :Configuration, 'rails/application/configuration' autoload :Finisher, 'rails/application/finisher' autoload :Railties, 'rails/application/railties' diff --git a/railties/lib/rails/cli.rb b/railties/lib/rails/cli.rb index 1260772605..a4b86974c2 100644 --- a/railties/lib/rails/cli.rb +++ b/railties/lib/rails/cli.rb @@ -5,9 +5,6 @@ require 'rails/script_rails_loader' # the rest of this script is not run. Rails::ScriptRailsLoader.exec_script_rails! -railties_path = File.expand_path('../../lib', __FILE__) -$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path) - require 'rails/ruby_version_check' Signal.trap("INT") { puts; exit } diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 72bfe207d7..33dcdde8d0 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -324,7 +324,6 @@ module Rails # MyEngine::Engine.load_seed # class Engine < Railtie - autoload :Configurable, "rails/engine/configurable" autoload :Configuration, "rails/engine/configuration" class << self |