aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-11-18 16:28:12 -0800
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-11-18 16:28:37 -0800
commit520b8b59110dd130c89b317b6bd65d8644c7836f (patch)
tree95d93326f18d529b6f9f40cd0932dc549232e2ed /railties/lib/rails/application.rb
parent4403dfac6ce876c7ffb7a450b2249864c7a17cb7 (diff)
downloadrails-520b8b59110dd130c89b317b6bd65d8644c7836f.tar.gz
rails-520b8b59110dd130c89b317b6bd65d8644c7836f.tar.bz2
rails-520b8b59110dd130c89b317b6bd65d8644c7836f.zip
Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 7c2d8eab67..c8e4d8943b 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -3,11 +3,6 @@ module Rails
include Initializable
class << self
- def inherited(klass)
- Rails.application ||= klass unless klass.name =~ /Rails/
- super
- end
-
# Stub out App initialize
def initialize!
new
@@ -38,6 +33,7 @@ module Rails
end
def initialize
+ Rails.application ||= self
run_initializers(self)
end