Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add Rails::Application pointer to the default app to add symmetry to …

…Foo::Application
  • Loading branch information...
commit 92126521551a7c62e9032eda4a2b8a6d92c0279f 1 parent 6545a68
@josh josh authored
View
6 railties/lib/rails/application.rb
@@ -16,7 +16,11 @@ class << self
alias :configure :class_eval
def instance
- @instance ||= new
+ if instance_of?(Rails::Application)
+ Rails.application.instance
+ else
+ @instance ||= new
+ end
end
def inherited(base)
View
2  railties/lib/rails/tasks/middleware.rake
@@ -3,5 +3,5 @@ task :middleware => :environment do
Rails.configuration.middleware.active.each do |middleware|
puts "use #{middleware.inspect}"
end
- puts "run #{Rails.application.class.name}"
+ puts "run #{Rails::Application.class.name}"
end
Please sign in to comment.
Something went wrong with that request. Please try again.