fixed and re-enabled support for memcache in the production site

[selectricity-live] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 3e5f1c6b4408031dbba3bdb81fd3401acbb3de00..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')


@@ -59,10 +59,9 @@ end
 
 # Include your application configuration below
 
 
 # Include your application configuration below
 

-MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.org>'} 
+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'