diff --git a/config/database.yml b/config/database.yml index 7131c54..e1ddcb1 100644 --- a/config/database.yml +++ b/config/database.yml @@ -2,7 +2,7 @@ # gem install sqlite3-ruby (not necessary on OS X Leopard) development: &default - adapter: mysql + adapter: mysql2 database: rebirth_development pool: 5 timeout: 5000 diff --git a/config/environment.rb b/config/environment.rb index 005441a..5711fbc 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -11,7 +11,7 @@ Rails::Initializer.run do |config| #config.time_zone = 'Eastern Time (US & Canada)' - config.active_record.default_timezone = 'Eastern Time (US & Canada)' + config.active_record.default_timezone = :local config.action_mailer.delivery_method = :smtp #config.action_mailer.delivery_method = :sendmail end diff --git a/config/environments/development.rb b/config/environments/development.rb index 0c39a12..d34c2a7 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -18,8 +18,5 @@ config.action_mailer.raise_delivery_errors = false HOST = 'localhost' -config.gem 'mysql', - :version => '2.8.1' - PHOTOCRACY_SITE_ID = 9 ALLOURIDEAS_SITE_ID = 13 -- libgit2 0.21.2