diff options
| author | Arthur Neves <arthurnn@gmail.com> | 2016-03-21 15:13:57 -0400 |
|---|---|---|
| committer | Arthur Neves <arthurnn@gmail.com> | 2016-03-21 15:13:57 -0400 |
| commit | 01ef3b7d71a597f3757ddf26bd21d42ba2b691b2 (patch) | |
| tree | e7438fb4633c392edcc87aa46ae3176ca8b59f9a /railties/lib | |
| parent | 07f3ae8f35d2c422b0fd8d794af0f781aad9a96e (diff) | |
| parent | 1356e53b7cb20968c81fbddb71aa378dee80ee03 (diff) | |
| download | rails-01ef3b7d71a597f3757ddf26bd21d42ba2b691b2.tar.gz rails-01ef3b7d71a597f3757ddf26bd21d42ba2b691b2.tar.bz2 rails-01ef3b7d71a597f3757ddf26bd21d42ba2b691b2.zip | |
Merge pull request #24243 from dewski/dont-upgrade-file-watcher
Comment out config.file_watcher during Rails upgrade process
Diffstat (limited to 'railties/lib')
| -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 |