X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/34fe63727a8929d7e9c529feee1f0c1e827acdfa..25bfcc0f6b5344acb4039457f8492df7fbada7fc:/config/environment.rb?ds=inline

diff --git a/config/environment.rb b/config/environment.rb
old mode 100644
new mode 100755
index 6edda72..7159e1f
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -36,7 +36,7 @@ Rails::Initializer.run do |config|
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
+  config.active_record.default_timezone = :utc
   
   # See Rails::Configuration for more options
 end
@@ -50,7 +50,7 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
-MAIL_CONFIG = { :from => 'HyperChad <info@hyperchad.media.mit.edu>'} 
+MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'} 
 
 # Include your application configuration below
 require 'uniq_token'
@@ -79,12 +79,14 @@ module LoginEngine
   config :salt, "voothingboat"
   config :email_from, MAIL_CONFIG[:from]
   config :admin_email, MAIL_CONFIG[:from]
-  config :app_name, 'HyperChad'
+  config :app_name, 'Selectricity'
   config :changeable_fields, []
   config :use_email_notification, true
   config :confirm_account, false
+end
 Engines.start :login
 
 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"
+