diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-20 22:41:35 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-20 22:41:35 +0000 |
| commit | 20e3cfe52d294893ad46307440e4acf1f02165ea (patch) | |
| tree | b555bce70a9841d06b731eb8fe76697cd8c708d7 /railties/lib | |
| parent | a61360688cd0e1f43f523866384d0d0796a4ea73 (diff) | |
| download | rails-20e3cfe52d294893ad46307440e4acf1f02165ea.tar.gz rails-20e3cfe52d294893ad46307440e4acf1f02165ea.tar.bz2 rails-20e3cfe52d294893ad46307440e4acf1f02165ea.zip | |
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
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 6 |
1 files changed, 1 insertions, 5 deletions
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" |