diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-03-23 06:09:04 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 06:09:04 +1030 |
| commit | b5dc9c1a21d0bfaaf66de955e84acef4861e36c7 (patch) | |
| tree | 3f50f8911b5df6592931ffc74fbde93780313547 /railties/lib | |
| parent | e8417de1d853bed2dc41129ecb3a9f3072f4ded6 (diff) | |
| parent | 142db6269bf6486440627d9cd884dc0e33179313 (diff) | |
| download | rails-b5dc9c1a21d0bfaaf66de955e84acef4861e36c7.tar.gz rails-b5dc9c1a21d0bfaaf66de955e84acef4861e36c7.tar.bz2 rails-b5dc9c1a21d0bfaaf66de955e84acef4861e36c7.zip | |
Merge pull request #28523 from y-yagi/dont_comment_out_file_watcher_during_rails_upgrade_process
Don't comment out config.file_watcher during Rails upgrade
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 |
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 |