aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/finisher.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/application/finisher.rb')
-rw-r--r--railties/lib/rails/application/finisher.rb27
1 files changed, 6 insertions, 21 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index bae464a840..028c8814c4 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -33,27 +33,6 @@ module Rails
end
end
- initializer :add_sprockets_route do |app|
- assets = config.assets
- if assets.enabled
- app.routes.append do
- mount app.assets => assets.prefix
- end
- end
- end
-
- initializer :set_sprockets_logger do |app|
- if config.assets.enabled
- app.assets.logger = Rails.logger
- end
- end
-
- initializer :index_sprockets_environment do |app|
- if config.assets.enabled && config.action_controller.perform_caching
- app.assets = app.assets.index
- end
- end
-
initializer :build_middleware_stack do
build_middleware_stack
end
@@ -62,6 +41,10 @@ module Rails
ActionDispatch::Reloader.prepare!
end
+ initializer :define_main_app_helper do |app|
+ app.routes.define_mounted_helper(:main_app)
+ end
+
initializer :eager_load! do
if config.cache_classes && !$rails_rake_task
ActiveSupport.run_load_hooks(:before_eager_load, self)
@@ -74,6 +57,8 @@ module Rails
end
# Force routes to be loaded just at the end and add it to to_prepare callbacks
+ # This needs to be after the finisher hook to ensure routes added in the hook
+ # are still loaded.
initializer :set_routes_reloader do |app|
reloader = lambda { app.routes_reloader.execute_if_updated }
reloader.call