diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-24 09:24:40 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-24 09:24:40 -0200 |
| commit | 41e607dee20b15d8dc71dc16a08d4bbe9e36ac70 (patch) | |
| tree | a99108c3e60bb9f44f5f1870d885971de383b9e4 /railties/lib/rails/generators | |
| parent | 16cf25e717c9b13e402fda33fe859684e1d8a154 (diff) | |
| parent | e62e6d409986cd5c99234689aa49e3162d7b3a59 (diff) | |
| download | rails-41e607dee20b15d8dc71dc16a08d4bbe9e36ac70.tar.gz rails-41e607dee20b15d8dc71dc16a08d4bbe9e36ac70.tar.bz2 rails-41e607dee20b15d8dc71dc16a08d4bbe9e36ac70.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/generators')
| -rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/console | 1 | ||||
| -rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/server | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/script/console b/railties/lib/rails/generators/rails/app/templates/script/console index 20aa799d2f..6043f3792b 100755 --- a/railties/lib/rails/generators/rails/app/templates/script/console +++ b/railties/lib/rails/generators/rails/app/templates/script/console @@ -1,2 +1,3 @@ require File.expand_path('../../config/application', __FILE__) require 'rails/commands/console' +Rails::Console.start diff --git a/railties/lib/rails/generators/rails/app/templates/script/server b/railties/lib/rails/generators/rails/app/templates/script/server index a7aaee2953..709ca002df 100755 --- a/railties/lib/rails/generators/rails/app/templates/script/server +++ b/railties/lib/rails/generators/rails/app/templates/script/server @@ -1,2 +1,3 @@ require File.expand_path('../../config/application', __FILE__) require 'rails/commands/server' +Rails::Server.start |