diff options
author | Carl Lerche <carllerche@mac.com> | 2009-12-31 10:36:24 -0800 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2009-12-31 11:57:59 -0800 |
commit | 1e41097294b6f966f65909db5c56c9fc21b665f7 (patch) | |
tree | 5174c6a407cf0b513a8854233d0e1ff9d01be693 /railties/lib/rails/generators | |
parent | 783caae52f3c00975490cd40dc849f648c8fa9e1 (diff) | |
download | rails-1e41097294b6f966f65909db5c56c9fc21b665f7.tar.gz rails-1e41097294b6f966f65909db5c56c9fc21b665f7.tar.bz2 rails-1e41097294b6f966f65909db5c56c9fc21b665f7.zip |
Fully remove config.frameworks in favor of requires in boot.rb
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 8 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 15dc553e53..ec0729db04 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -13,16 +13,8 @@ module <%= app_name.classify %> # :all can be used as a placeholder for all plugins not explicitly named # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - # Skip frameworks you're not going to use. To use Rails without a database, - # you must remove the Active Record framework. -<% if options[:skip_activerecord] -%> - config.frameworks -= [ :active_record ] -<% else -%> - # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] - # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector, :forum_observer -<% end -%> # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index 5aa49ca5e6..221421855c 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -14,3 +14,12 @@ else end require 'rails' +# To skip frameworks you're not going to use, remove require "rails" and +# list the frameworks that you are going to use. +# +# require "active_model/rails" +# require "active_record/rails" +# require "action_controller/rails" +# require "action_view/rails" +# require "action_mailer/rails" +# require "active_resource/rails"
\ No newline at end of file |