aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-04 07:47:50 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-04 07:47:50 -0700
commit4110abea002a1725b9a1c80df44cc46842a66856 (patch)
treea830e5879a7d2761f79fe61b5b244acbd99757bd
parent8e0d43bc500f751d72a3f65caafa9fec2f2bda96 (diff)
parente1bd8d1a5c1ee7a296fca5bb62bace53809e3b95 (diff)
downloadrails-4110abea002a1725b9a1c80df44cc46842a66856.tar.gz
rails-4110abea002a1725b9a1c80df44cc46842a66856.tar.bz2
rails-4110abea002a1725b9a1c80df44cc46842a66856.zip
Merge pull request #10463 from prathamesh-sonpatki/dir
dir -> directory [ci skip]
-rw-r--r--railties/lib/rails/commands.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 0d1286031c..e8c42b149b 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -66,7 +66,7 @@ when 'console'
Rails::Console.start(Rails.application, options)
when 'server'
- # Change to the application's path if there is no config.ru file in current dir.
+ # Change to the application's path if there is no config.ru file in current directory.
# This allows us to run `rails server` from other directories, but still get
# the main config.ru and properly set the tmp directory.
Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))