diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2018-05-14 07:29:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 07:29:03 +0900 |
| commit | df850b8d7126044a820291bbfd2bce80636a442c (patch) | |
| tree | 83a9ef2dd01030e1366d53b4ba242a431fdc9526 /railties/lib | |
| parent | 448cb2148c1cfcef25b2c8964d8320f613e19c7c (diff) | |
| parent | 8efa112ca625cf8e895ed5af1433dce430929970 (diff) | |
| download | rails-df850b8d7126044a820291bbfd2bce80636a442c.tar.gz rails-df850b8d7126044a820291bbfd2bce80636a442c.tar.bz2 rails-df850b8d7126044a820291bbfd2bce80636a442c.zip | |
Merge pull request #32837 from ttanimichi/app-update-skip-spring
Don't generate `config/spring.rb` in `app:update` task when spring isn't loaded
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/app_updater.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/app_updater.rb b/railties/lib/rails/app_updater.rb index 5e2ea93c5e..e37839bf11 100644 --- a/railties/lib/rails/app_updater.rb +++ b/railties/lib/rails/app_updater.rb @@ -28,6 +28,7 @@ module Rails options[:skip_sprockets] = !defined?(Sprockets::Railtie) options[:skip_puma] = !defined?(Puma) options[:skip_bootsnap] = !defined?(Bootsnap) + options[:skip_spring] = !defined?(Spring) options end end |