Merge branch 'master' into moderation

[rails.git] / script / rails

diff --git a/script/rails b/script/rails
index 9a5a81dcf67b7df5efe05d3c466b134095e139f3..4cea4ea17353ae2c93879c61fe73de061a0be05e 100755 (executable)
--- a/script/rails
+++ b/script/rails
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path("../../config/application", __FILE__)
-require File.expand_path("../../config/boot", __FILE__)
+APP_PATH = File.expand_path("../config/application", __dir__)
+require File.expand_path("../config/boot", __dir__)
 require "rails/commands"