diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-05-29 20:37:35 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2017-05-29 20:37:35 +0200 |
| commit | e1758b5e8c8d49fdf931b0b3f8009810880113a6 (patch) | |
| tree | 97181998af56fff415827af679253b1472aa0006 /railties/exe | |
| parent | 61413b592dbbd6d7adbcb16fb95f760b0656cd9b (diff) | |
| parent | e7a33a5ed74cc0987544396f0742110fa5a5e228 (diff) | |
| download | rails-e1758b5e8c8d49fdf931b0b3f8009810880113a6.tar.gz rails-e1758b5e8c8d49fdf931b0b3f8009810880113a6.tar.bz2 rails-e1758b5e8c8d49fdf931b0b3f8009810880113a6.zip | |
Merge branch 'master' into unlock-minitest
Diffstat (limited to 'railties/exe')
| -rwxr-xr-x | railties/exe/rails | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/exe/rails b/railties/exe/rails index 7e791c1f99..a5635c2297 100755 --- a/railties/exe/rails +++ b/railties/exe/rails @@ -1,9 +1,9 @@ #!/usr/bin/env ruby -git_path = File.expand_path("../../../.git", __FILE__) +git_path = File.expand_path("../../.git", __dir__) if File.exist?(git_path) - railties_path = File.expand_path("../../lib", __FILE__) + railties_path = File.expand_path("../lib", __dir__) $:.unshift(railties_path) end require "rails/cli" |