X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/108e13f9199648108e61f282a56f9ab4e7bc5dc6..75c24bb5bf2e93863888937a5f91377e6abe4388:/config/environment.rb?ds=inline

diff --git a/config/environment.rb b/config/environment.rb
index 80f19b4..32d313b 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -28,7 +28,7 @@ Rails::Initializer.run do |config|
 
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')
-  # config.action_controller.session_store = :active_record_store
+  config.action_controller.session_store = :active_record_store
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper, 
@@ -59,15 +59,18 @@ end
 
 # Include your application configuration below
 
-MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'} 
+MAIL_CONFIG = { :from => 'Selectricity <team@selectricity.org>'} 
 
 require 'uniq_token'
 require 'randarray'
-require 'gruff'
+require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
-
 require 'rubyvote'
-ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
+ELECTION_TYPES = {'ssd' => "Schulze Method",
+                  'plurality' => "Plurality",
+                  'approval' => "Approval",
+                  'condorcet' => "Condorcet",
+                  'borda' => "Borda Count"}
 
 class String
   # alternate capitalization method that does not lowercase the rest of