removed unnecessary line/

[selectricity-live] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index fcabdd87aa6279b6003532259625536ac62e3fb3..28ecf9eca9b69a83661596fc3da8790ab4524f3c 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present

-RAILS_GEM_VERSION = '1.2.3' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION

 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')


@@ -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')
 
   # 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, 
 
   # 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,17 +59,16 @@ end
 
 # Include your application configuration below
 
 
 # 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 'uniq_token'

-require 'randarray'

 require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
 require 'rubyvote'
 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
                   'borda' => "Borda Count"}
 
 class String