Download as
Browse Code »

Commit ee7b1f918a6faca8cd787bc3e9a3bc3ab9f4c8a6

Authored by Luke Baker
1 parent fb81a3cd
Exists in master and in 1 other branch production-vendorized

default to mysql2; fix timezone setting

Showing 3 changed files with 2 additions and 5 deletions   Show diff stats
config/database.yml
  Diff comments   View file @ee7b1f9
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # gem install sqlite3-ruby (not necessary on OS X Leopard) 2 # gem install sqlite3-ruby (not necessary on OS X Leopard)
3 3
4 development: &default 4 development: &default
5 - adapter: mysql 5 + adapter: mysql2
6 database: rebirth_development 6 database: rebirth_development
7 pool: 5 7 pool: 5
8 timeout: 5000 8 timeout: 5000
config/environment.rb
  Diff comments   View file @ee7b1f9
@@ -11,7 +11,7 @@ Rails::Initializer.run do |config| @@ -11,7 +11,7 @@ Rails::Initializer.run do |config|
11 11
12 #config.time_zone = 'Eastern Time (US & Canada)' 12 #config.time_zone = 'Eastern Time (US & Canada)'
13 13
14 - config.active_record.default_timezone = 'Eastern Time (US & Canada)' 14 + config.active_record.default_timezone = :local
15 config.action_mailer.delivery_method = :smtp 15 config.action_mailer.delivery_method = :smtp
16 #config.action_mailer.delivery_method = :sendmail 16 #config.action_mailer.delivery_method = :sendmail
17 end 17 end
config/environments/development.rb
  Diff comments   View file @ee7b1f9
@@ -18,8 +18,5 @@ config.action_mailer.raise_delivery_errors = false @@ -18,8 +18,5 @@ config.action_mailer.raise_delivery_errors = false
18 18
19 HOST = 'localhost' 19 HOST = 'localhost'
20 20
21 -config.gem 'mysql',  
22 - :version => '2.8.1'  
23 -  
24 PHOTOCRACY_SITE_ID = 9 21 PHOTOCRACY_SITE_ID = 9
25 ALLOURIDEAS_SITE_ID = 13 22 ALLOURIDEAS_SITE_ID = 13