projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed colors on graphs
[selectricity]
/
config
/
environment.rb
diff --git
a/config/environment.rb
b/config/environment.rb
index ba927343d1dc89aca7a36e7ee2b63e0eaadb4623..32d313b2ed47ea9e358256050c62d6f38f1519cd 100644
(file)
--- 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')
# 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,12
+59,18
@@
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 'randarray'
require 'uniq_token'
require 'randarray'
+require 'gruff-0.2.8/lib/gruff'
+require 'sparklines'
require 'rubyvote'
require 'rubyvote'
-require 'gruff'
+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
class String
# alternate capitalization method that does not lowercase the rest of
@@
-84,6
+90,10
@@
class String
end
end
end
end
+#Change the session store key, so that it will not conflict with other webapps
+ActionController::Base.session_options[:session_key] = 'selectricity_session_id'
+CGI::Session.expire_after 1.year
+
# action mailer configuration
ActionMailer::Base.delivery_method = :sendmail
ActionMailer::Base.default_charset = "utf-8"
# action mailer configuration
ActionMailer::Base.delivery_method = :sendmail
ActionMailer::Base.default_charset = "utf-8"
Benjamin Mako Hill
||
Want to submit a patch?