aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-03-22 21:49:33 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-03-22 21:55:28 +0900
commit142db6269bf6486440627d9cd884dc0e33179313 (patch)
treefcd29ff19b26f64f0a2d7a69c5887d859f91c866 /railties/lib/rails
parent34fe2a4fc778d18b7fe6bdf3629c1481bee789b9 (diff)
downloadrails-142db6269bf6486440627d9cd884dc0e33179313.tar.gz
rails-142db6269bf6486440627d9cd884dc0e33179313.tar.bz2
rails-142db6269bf6486440627d9cd884dc0e33179313.zip
Don't comment out config.file_watcher during Rails upgrade
This is necessary only when updating to Rails 5.0, it is not necessary for updating to 5.1. Related #24243
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 38830ba38f..b32878cf0b 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -109,8 +109,6 @@ module Rails
config
- gsub_file "config/environments/development.rb", /^(\s+)config\.file_watcher/, '\1# config.file_watcher'
-
unless cookie_serializer_config_exist
gsub_file "config/initializers/cookies_serializer.rb", /json(?!,)/, "marshal"
end