projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few major changes:
[selectricity-live]
/
config
/
environment.rb
diff --git
a/config/environment.rb
b/config/environment.rb
index 34a2d87ec383b4d871844e3311313a2fc99297e4..dcc9fad3b4ee5a7d2a514c3533ba74394ad85b31 100644
(file)
--- a/
config/environment.rb
+++ b/
config/environment.rb
@@
-50,8
+50,20
@@
end
# inflect.uncountable %w( fish sheep )
# end
# inflect.uncountable %w( fish sheep )
# end
+MAIL_CONFIG = { :from => 'VotingBooth <info@votingbooth.mako.cc>'}
+
# Include your application configuration below
require 'uniq_token'
require 'randarray'
require 'rubyvote'
# Include your application configuration below
require 'uniq_token'
require 'randarray'
require 'rubyvote'
+module LoginEngine
+ config :salt, "voothingboat"
+ config :email_from, MAIL_CONFIG[:from]
+end
+
+Engines.start :login
+
+# action mailer configuration
+ActionMailer::Base.delivery_method = :sendmail
+ActionMailer::Base.default_charset = "utf-8"
Benjamin Mako Hill
||
Want to submit a patch?