diff options
| author | Garrett Bjerkhoel <me@garrettbjerkhoel.com> | 2016-03-18 13:31:51 -0700 |
|---|---|---|
| committer | Garrett Bjerkhoel <me@garrettbjerkhoel.com> | 2016-03-18 13:31:51 -0700 |
| commit | 57e258eb433c9a2f0ee00d1bd562a6d3370c3088 (patch) | |
| tree | 613fbb94cff1ca077f07fcc568be2049c1ca5dfa /railties | |
| parent | a4ef62279d69d901b99fe0e71338b5aaebab01c0 (diff) | |
| download | rails-57e258eb433c9a2f0ee00d1bd562a6d3370c3088.tar.gz rails-57e258eb433c9a2f0ee00d1bd562a6d3370c3088.tar.bz2 rails-57e258eb433c9a2f0ee00d1bd562a6d3370c3088.zip | |
Don't upgrade config.file_watcher during upgrade path
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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 |