From b61f6f59805eec4f5bb873a85910c9fe00e839a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 23 Mar 2010 13:40:19 +0100 Subject: Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive. --- .../config/environments/development.rb.tt | 19 ------------- .../templates/config/environments/production.rb.tt | 33 ---------------------- .../app/templates/config/environments/test.rb.tt | 29 ------------------- 3 files changed, 81 deletions(-) delete mode 100644 railties/lib/generators/rails/app/templates/config/environments/development.rb.tt delete mode 100644 railties/lib/generators/rails/app/templates/config/environments/production.rb.tt delete mode 100644 railties/lib/generators/rails/app/templates/config/environments/test.rb.tt (limited to 'railties/lib/generators/rails/app/templates/config/environments') diff --git a/railties/lib/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/generators/rails/app/templates/config/environments/development.rb.tt deleted file mode 100644 index f0e917dd96..0000000000 --- a/railties/lib/generators/rails/app/templates/config/environments/development.rb.tt +++ /dev/null @@ -1,19 +0,0 @@ -<%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the webserver when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_view.debug_rjs = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false -end diff --git a/railties/lib/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/generators/rails/app/templates/config/environments/production.rb.tt deleted file mode 100644 index 917052c3df..0000000000 --- a/railties/lib/generators/rails/app/templates/config/environments/production.rb.tt +++ /dev/null @@ -1,33 +0,0 @@ -<%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb - - # The production environment is meant for finished, "live" apps. - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # See everything in the log (default is :info) - # config.log_level = :debug - - # Use a different logger for distributed setups - # config.logger = SyslogLogger.new - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Disable Rails's static asset server - # In production, Apache or nginx will already do this - config.serve_static_assets = false - - # Enable serving of images, stylesheets, and javascripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! -end diff --git a/railties/lib/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/generators/rails/app/templates/config/environments/test.rb.tt deleted file mode 100644 index 0b87b241ec..0000000000 --- a/railties/lib/generators/rails/app/templates/config/environments/test.rb.tt +++ /dev/null @@ -1,29 +0,0 @@ -<%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb - - # The test environment is used exclusively to run your application's - # test suite. You never need to work with it otherwise. Remember that - # your test database is "scratch space" for the test suite and is wiped - # and recreated between test runs. Don't rely on the data there! - config.cache_classes = true - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql -end -- cgit v1.2.3