From 20e3cfe52d294893ad46307440e4acf1f02165ea Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 20 Mar 2005 22:41:35 +0000 Subject: Combined the script/environment.rb used for gems and regular files version. If vendor/rails/* has all the frameworks, then files version is used, otherwise gems #878 [Nicholas Seckar] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@946 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../rails_generator/generators/applications/app/app_generator.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 3916d6905f..56f82f360f 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -37,11 +37,7 @@ class AppGenerator < Rails::Generator::Base m.template "configs/apache.conf", "public/.htaccess" # Environments - if options[:gem] - m.file "environments/shared_for_gem.rb", "config/environment.rb" - else - m.file "environments/shared.rb", "config/environment.rb" - end + m.file "environments/environment.rb", "config/environment.rb" m.file "environments/production.rb", "config/environments/production.rb" m.file "environments/development.rb", "config/environments/development.rb" m.file "environments/test.rb", "config/environments/test.rb" -- cgit v1.2.3