X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/25bfcc0f6b5344acb4039457f8492df7fbada7fc..5f51982916827b84d73bfa8f3a98a9ee1d48d3ce:/config/environment.rb

diff --git a/config/environment.rb b/config/environment.rb
old mode 100755
new mode 100644
index 7159e1f..7d3657e
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,17 +5,20 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '1.1.6'
+RAILS_GEM_VERSION = '1.2.3' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence those specified here
+  # Settings in config/environments/* take precedence over those specified here
   
   # Skip frameworks you're not going to use (only works if using vendor/rails)
   # config.frameworks -= [ :action_web_service, :action_mailer ]
 
+  # Only load the plugins named here, by default all plugins in vendor/plugins are loaded
+  # config.plugins = %W( exception_notification ssl_requirement )
+
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
@@ -36,7 +39,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,9 +53,14 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
-MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'} 
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register "application/x-mobile", :mobile
 
 # Include your application configuration below
+
+MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'} 
+
 require 'uniq_token'
 require 'randarray'
 require 'rubyvote'
@@ -75,17 +83,6 @@ class String
   end
 end
 
-module LoginEngine
-  config :salt, "voothingboat"
-  config :email_from, MAIL_CONFIG[:from]
-  config :admin_email, MAIL_CONFIG[:from]
-  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"