diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
| commit | 8260f0b40f8954f1822a0f856f7c0706afbba0bd (patch) | |
| tree | 1ec6fe65274eeb87c2030ba2daa3e230a375e846 /railties/lib/generators/rails/app/templates/script/server.tt | |
| parent | 6241d4e5535190b817e546130cfe179b641da1ba (diff) | |
| parent | 6d6e6105c074eb9f266619e77a0873635af94124 (diff) | |
| download | rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.gz rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.bz2 rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'railties/lib/generators/rails/app/templates/script/server.tt')
| -rwxr-xr-x | railties/lib/generators/rails/app/templates/script/server.tt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/railties/lib/generators/rails/app/templates/script/server.tt b/railties/lib/generators/rails/app/templates/script/server.tt deleted file mode 100755 index 4fd0cc7832..0000000000 --- a/railties/lib/generators/rails/app/templates/script/server.tt +++ /dev/null @@ -1,5 +0,0 @@ -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands/server' - -Dir.chdir(File.expand_path('../..', __FILE__)) -Rails::Server.start |