diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-05-06 09:58:25 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-05-06 10:00:01 +0200 |
| commit | a64d47ff04574e701a656efcb5283179159c7908 (patch) | |
| tree | 9fcb9f0377cf2b90b3b47575276761504ca6f5c9 /railties | |
| parent | 6f02160086266be3b004eb447074aaf02e78234d (diff) | |
| parent | 03c32c6d806136b99d54b4e1d3b662a5acf48d3f (diff) | |
| download | rails-a64d47ff04574e701a656efcb5283179159c7908.tar.gz rails-a64d47ff04574e701a656efcb5283179159c7908.tar.bz2 rails-a64d47ff04574e701a656efcb5283179159c7908.zip | |
Merge pull request #20023 from mohnish/patch-1
Use the built-in rake tasks
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/setup | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 0525cde92f..b61c4448b5 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +* `bin/setup` uses built-in rake tasks (`log:clear`, `tmp:clear`). + + *Mohnish Thallavajhula* + * Fix mailer previews with attachments by using the mail gem's own API to locate the first part of the correct mime type. diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup b/railties/lib/rails/generators/rails/app/templates/bin/setup index eee810be30..3a5a2cc1e3 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/setup +++ b/railties/lib/rails/generators/rails/app/templates/bin/setup @@ -22,8 +22,7 @@ chdir APP_ROOT do system 'ruby bin/rake db:setup' puts "\n== Removing old logs and tempfiles ==" - rm_f Dir.glob('log/*') - rm_rf 'tmp/cache' + system 'ruby bin/rake log:clear tmp:clear' puts "\n== Restarting application server ==" touch 'tmp/restart.txt' |