aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-05-23 16:41:40 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-05-23 16:41:40 -0700
commit9875574bbfebfdca96a80cf1c29c83adcbbda8f8 (patch)
treee483b87ac5bf63258a40a318f792cd56562fa8c6 /railties
parentd77b576c0330d8b1c6189cb94814382ce32baab6 (diff)
downloadrails-9875574bbfebfdca96a80cf1c29c83adcbbda8f8.tar.gz
rails-9875574bbfebfdca96a80cf1c29c83adcbbda8f8.tar.bz2
rails-9875574bbfebfdca96a80cf1c29c83adcbbda8f8.zip
Revert "require the constants we use. ensure that root always returns a Pathname"
This reverts commit d77b576c0330d8b1c6189cb94814382ce32baab6.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/engine/configuration.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index f82c1d00fb..e31df807a6 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -1,5 +1,4 @@
require 'rails/railtie/configuration'
-require 'pathname'
module Rails
class Engine
@@ -9,7 +8,7 @@ module Rails
def initialize(root=nil)
super()
- @root = root && Pathname.new(root)
+ @root = root
@generators = app_generators.dup
end