From 57e258eb433c9a2f0ee00d1bd562a6d3370c3088 Mon Sep 17 00:00:00 2001
From: Garrett Bjerkhoel <me@garrettbjerkhoel.com>
Date: Fri, 18 Mar 2016 13:31:51 -0700
Subject: Don't upgrade config.file_watcher during upgrade path
---
railties/lib/rails/generators/rails/app/app_generator.rb | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'railties/lib/rails')
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index e9435c946a..d6be69e16c 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -95,9 +95,14 @@ module Rails
action_cable_config_exist = File.exist?('config/cable.yml')
ssl_options_exist = File.exist?('config/initializers/ssl_options.rb')
rack_cors_config_exist = File.exist?('config/initializers/cors.rb')
+ development_config_exist = File.exist?('config/environments/development.rb')
config
+ if development_config_exist
+ gsub_file 'config/environments/development.rb', /^(\s+)config\.file_watcher/, '\1# config.file_watcher'
+ end
+
unless callback_terminator_config_exist
remove_file 'config/initializers/callback_terminator.rb'
end
--
cgit v1.2.3