From 185c93eb0c8df629033be48e5eef431190c65226 Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Thu, 25 Feb 2016 14:31:19 +1030 Subject: Use AS::Executor / AS::Reloader to support reloading in ActionCable --- railties/lib/rails/generators/rails/app/templates/config.ru | 4 ++++ railties/lib/rails/generators/rails/app/templates/config.ru.tt | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 railties/lib/rails/generators/rails/app/templates/config.ru delete mode 100644 railties/lib/rails/generators/rails/app/templates/config.ru.tt (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru new file mode 100644 index 0000000000..bd83b25412 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/config.ru @@ -0,0 +1,4 @@ +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Rails.application diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru.tt b/railties/lib/rails/generators/rails/app/templates/config.ru.tt deleted file mode 100644 index 343c0833d7..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/config.ru.tt +++ /dev/null @@ -1,10 +0,0 @@ -# This file is used by Rack-based servers to start the application. - -require ::File.expand_path('../config/environment', __FILE__) -<%- unless options[:skip_action_cable] -%> - -# Action Cable requires that all classes are loaded in advance -Rails.application.eager_load! -<%- end -%> - -run Rails.application -- cgit v1.2.3