diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-26 18:47:55 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-26 18:47:55 +0100 |
| commit | 395d6648ce7549f71dd0a76dc061e87f608aaaab (patch) | |
| tree | 4dbb6eb54ff784143bf6e2f671057f0b8162dba5 /railties/lib/rails/engine.rb | |
| parent | fc266d7ec2cf1d3f9daf585ea6b79b61467a175f (diff) | |
| download | rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.tar.gz rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.tar.bz2 rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.zip | |
Move application configuration to the application configuration object, remove railtie_name and engine_name and allow to set the configuration object.
Diffstat (limited to 'railties/lib/rails/engine.rb')
| -rw-r--r-- | railties/lib/rails/engine.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index e4888cdef7..67a2dc6ac2 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -10,8 +10,8 @@ module Rails class << self attr_accessor :called_from - alias :engine_name :railtie_name - alias :engine_names :railtie_names + # TODO Remove this. It's deprecated. + alias :engine_name :railtie_name def inherited(base) unless base.abstract_railtie? @@ -41,7 +41,7 @@ module Rails end end - delegate :middleware, :paths, :metal_loader, :root, :to => :config + delegate :middleware, :paths, :root, :to => :config def load_tasks super |