aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-19 15:24:00 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-19 15:24:00 -0800
commitc7c39f52dcce4ea6de2051ee7816c0cb9d583f8f (patch)
tree2ea73ce578cb72a70c86a744c76615890535161b /railties/lib/rails/application.rb
parent5df26dd7a91bb6d248b96c4308242a51ab59aa5c (diff)
downloadrails-c7c39f52dcce4ea6de2051ee7816c0cb9d583f8f.tar.gz
rails-c7c39f52dcce4ea6de2051ee7816c0cb9d583f8f.tar.bz2
rails-c7c39f52dcce4ea6de2051ee7816c0cb9d583f8f.zip
Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working"
Broke stuff. This reverts commit 520b8b59110dd130c89b317b6bd65d8644c7836f.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index c8e4d8943b..7c2d8eab67 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -3,6 +3,11 @@ 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
@@ -33,7 +38,6 @@ module Rails
end
def initialize
- Rails.application ||= self
run_initializers(self)
end