diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-01 17:46:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 17:46:40 -0400 |
| commit | f7388635f246b97a1aa0be54579339c6659fb865 (patch) | |
| tree | 67064c07a1126afcbcb6f536279e462d1fb6d42c /railties | |
| parent | 34b1e8f253fd44fdae7e772dc302e81a6616824d (diff) | |
| parent | 4f3624fa319dbd7b86338d99669762ed06a9a766 (diff) | |
| download | rails-f7388635f246b97a1aa0be54579339c6659fb865.tar.gz rails-f7388635f246b97a1aa0be54579339c6659fb865.tar.bz2 rails-f7388635f246b97a1aa0be54579339c6659fb865.zip | |
Merge pull request #29303 from Empact/bin-pathname
Remove the pathname dependency from bin/update and bin/setup
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/setup.tt | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/update.tt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt index 560cc64a3f..ee9d077c30 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt @@ -1,9 +1,8 @@ -require 'pathname' require 'fileutils' include FileUtils # path to your application root. -APP_ROOT = Pathname.new File.expand_path('..', __dir__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update.tt b/railties/lib/rails/generators/rails/app/templates/bin/update.tt index 0aedf0d6e2..5b6e50883e 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt @@ -1,9 +1,8 @@ -require 'pathname' require 'fileutils' include FileUtils # path to your application root. -APP_ROOT = Pathname.new File.expand_path('..', __dir__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") |