Merge from head -- breakage

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index e071a1437bf25b6c24074331c4f9d0a9efe09cc0..571638d14a3fc1a0ccefbce34442f8cbc1fa8fc0 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -63,10 +63,12 @@ MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'}
 
 require 'uniq_token'
 require 'randarray'
-require 'rubyvote'
 require 'gruff'
 require 'sparklines'
 
+require 'rubyvote'
+ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
+
 class String
   # alternate capitalization method that does not lowercase the rest of
   # the string -- which is almost never what I want