aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-03-20 12:34:21 -0500
committerJoshua Peek <josh@joshpeek.com>2010-03-20 12:34:21 -0500
commitf38e89cfbad6886a2812b1176e0c47b7d95cda43 (patch)
treedeacf96a79eb778e4fa02c6ba89b96d856f86498 /railties/lib/rails/application
parentf868c2afa9190604015b6c5fd3bcc58371f03570 (diff)
downloadrails-f38e89cfbad6886a2812b1176e0c47b7d95cda43.tar.gz
rails-f38e89cfbad6886a2812b1176e0c47b7d95cda43.tar.bz2
rails-f38e89cfbad6886a2812b1176e0c47b7d95cda43.zip
Move railties/builtin into lib
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/configuration.rb4
-rw-r--r--railties/lib/rails/application/finisher.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index d3a0ecb243..52f869b877 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -78,7 +78,7 @@ module Rails
end
def builtin_controller
- File.join(RAILTIES_PATH, "builtin", "rails_info") if Rails.env.development?
+ File.expand_path('../info_routes', __FILE__) if Rails.env.development?
end
def log_level
@@ -96,4 +96,4 @@ module Rails
end
end
end
-end \ No newline at end of file
+end
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index cb38d5a5db..978490f25f 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -23,7 +23,7 @@ module Rails
initializer :add_builtin_route do |app|
if Rails.env.development?
- app.routes_reloader.paths << File.join(RAILTIES_PATH, 'builtin', 'routes.rb')
+ app.routes_reloader.paths << File.expand_path('../../info_routes.rb', __FILE__)
end
end
@@ -45,4 +45,4 @@ module Rails
end
end
end
-end \ No newline at end of file
+end