diff options
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/configuration.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index e65c20de2c..498fd6a723 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -418,6 +418,7 @@ module Rails initializer :initialize_routing do next unless configuration.frameworks.include?(:action_controller) route_configuration_files << configuration.routes_configuration_file + route_configuration_files << configuration.builtin_routes_configuration_file reload_routes! end # diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 0fa42091dd..bf5b9478cc 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -158,6 +158,10 @@ module Rails @routes_configuration_file ||= File.join(root, 'config', 'routes.rb') end + def builtin_routes_configuration_file + @builtin_routes_configuration_file ||= File.join(RAILTIES_PATH, 'builtin', 'routes.rb') + end + def controller_paths @controller_paths ||= begin paths = [File.join(root, 'app', 'controllers')] |