X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/e7df11018ea1e15f8671f948126632be3ac86e84..a6c1e9a2e0cb4243fd48b83af0281eccef408b04:/config/environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 5ea9f10..ccd9ad0 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, 
@@ -65,12 +65,11 @@ require 'uniq_token'
 require 'randarray'
 require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
-
 require 'rubyvote'
-ELECTION_TYPES = {'ssd' => "Schulze Sequential Dropping",
-                  'plurality' => "Plurality/First Past the Post",
-                  'approval' => "Approval (Top Two)",
-                  'condorcet' => "Simple Condorcet",
+ELECTION_TYPES = {'ssd' => "Schulze Method",
+                  'plurality' => "Plurality",
+                  'approval' => "Approval",
+                  'condorcet' => "Condorcet",
                   'borda' => "Borda Count"}
 
 class String