aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/command
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-05-26 12:24:43 +0930
committerGitHub <noreply@github.com>2017-05-26 12:24:43 +0930
commit4cfcf1ee542706c92c6c9b2e973e81b673fb220f (patch)
tree3bd9ec449ab553c73f34ec018f5450938b6831c7 /railties/lib/rails/command
parent881823176a3fcaa3711900f2cdfd66b11a6df18a (diff)
parent40bdbce191ad90dfea43dad51fac5c4726b89392 (diff)
downloadrails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.tar.gz
rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.tar.bz2
rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.zip
Merge pull request #29176 from bogdanvlviv/define-path-with__dir__
Define path with __dir__
Diffstat (limited to 'railties/lib/rails/command')
-rw-r--r--railties/lib/rails/command/actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/command/actions.rb b/railties/lib/rails/command/actions.rb
index 8fda1c87c6..a00e58997c 100644
--- a/railties/lib/rails/command/actions.rb
+++ b/railties/lib/rails/command/actions.rb
@@ -5,7 +5,7 @@ module Rails
# This allows us to run `rails server` from other directories, but still get
# the main config.ru and properly set the tmp directory.
def set_application_directory!
- Dir.chdir(File.expand_path("../../", APP_PATH)) unless File.exist?(File.expand_path("config.ru"))
+ Dir.chdir(File.expand_path("../..", APP_PATH)) unless File.exist?(File.expand_path("config.ru"))
end
def require_application_and_environment!