diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-06-16 15:09:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 15:09:15 -0400 |
| commit | 095036467e4e06e56452da94077500d428dd0eed (patch) | |
| tree | 3443e6779bf5a1d0f73f3c6ceb5f22cdee12e303 /railties/lib/rails/command | |
| parent | 0804e58e1e6a52190a950f863622102b6b21ccb8 (diff) | |
| parent | b55cf266f9ccadf49276de230a8b0c2076f05202 (diff) | |
| download | rails-095036467e4e06e56452da94077500d428dd0eed.tar.gz rails-095036467e4e06e56452da94077500d428dd0eed.tar.bz2 rails-095036467e4e06e56452da94077500d428dd0eed.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'railties/lib/rails/command')
| -rw-r--r-- | railties/lib/rails/command/actions.rb | 2 |
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! |