Merge pull request #1733 from SAP-Oxygen/master-plugins_in_engine_patch
Cherry-picking patch for https://github.com/rails/rails/issues/1460 from 3-1-stable to master
This commit is contained in:
commit
b9fa32c75e
@ -78,10 +78,6 @@ def require_environment! #:nodoc:
|
||||
require environment if environment
|
||||
end
|
||||
|
||||
def eager_load! #:nodoc:
|
||||
railties.all(&:eager_load!)
|
||||
super
|
||||
end
|
||||
|
||||
def reload_routes!
|
||||
routes_reloader.reload!
|
||||
@ -100,14 +96,12 @@ def initialize!
|
||||
|
||||
def load_tasks(app=self)
|
||||
initialize_tasks
|
||||
railties.all { |r| r.load_tasks(app) }
|
||||
super
|
||||
self
|
||||
end
|
||||
|
||||
def load_console(app=self)
|
||||
initialize_console
|
||||
railties.all { |r| r.load_console(app) }
|
||||
super
|
||||
self
|
||||
end
|
||||
|
@ -395,12 +395,20 @@ def find(path)
|
||||
delegate :middleware, :root, :paths, :to => :config
|
||||
delegate :engine_name, :isolated?, :to => "self.class"
|
||||
|
||||
def load_tasks(*)
|
||||
def load_tasks(app=self)
|
||||
railties.all { |r| r.load_tasks(app) }
|
||||
super
|
||||
paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
|
||||
end
|
||||
|
||||
|
||||
def load_console(app=self)
|
||||
railties.all { |r| r.load_console(app) }
|
||||
super
|
||||
end
|
||||
|
||||
def eager_load!
|
||||
railties.all(&:eager_load!)
|
||||
|
||||
config.eager_load_paths.each do |load_path|
|
||||
matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
|
||||
Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
|
||||
|
Loading…
Reference in New Issue
Block a user