Merge Justin

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 6edda72a170c04f10d6fbd262bb4386bd3921bf3..77d020c81efd5ccc126a529c6855f5161d05468b 100644 (file)
--- 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 )
 
@@ -50,12 +53,18 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
-MAIL_CONFIG = { :from => 'HyperChad <info@hyperchad.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'
+require 'gruff'
 
 class String
   # alternate capitalization method that does not lowercase the rest of
@@ -75,16 +84,7 @@ class String
   end
 end
 
-module LoginEngine
-  config :salt, "voothingboat"
-  config :email_from, MAIL_CONFIG[:from]
-  config :admin_email, MAIL_CONFIG[:from]
-  config :app_name, 'HyperChad'
-  config :changeable_fields, []
-  config :use_email_notification, true
-  config :confirm_account, false
-Engines.start :login
-
 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"
+