aboutsummaryrefslogtreecommitdiffstats
path: root/config/environment.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/environment.rb')
-rw-r--r--config/environment.rb17
1 files changed, 2 insertions, 15 deletions
diff --git a/config/environment.rb b/config/environment.rb
index f2164f1c8..b958c6475 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -17,12 +17,8 @@ $:.push(File.join(File.dirname(__FILE__), '../commonlib/rblib'))
# (type "git submodule update --init" in the whatdotheyknow directory)
# ruby-ole and ruby-msg. We use a custom ruby-msg to avoid a name conflict
-$:.unshift(File.join(File.dirname(__FILE__), '../vendor/ruby-ole/lib'))
-$:.unshift(File.join(File.dirname(__FILE__), '../vendor/ruby-msg/lib'))
$:.unshift(File.join(File.dirname(__FILE__), '../vendor/plugins/globalize2/lib'))
-require 'memcache'
-
load "validate.rb"
load "config.rb"
load "format.rb"
@@ -53,7 +49,7 @@ Rails::Initializer.run do |config|
# config.plugins = %W( exception_notification ssl_requirement )
# Add additional load paths for your own custom dirs
- # config.load_paths += %W( #{RAILS_ROOT}/extras )
+ # config.load_paths += %W( #{Rails.root}/extras )
# Force all environments to use the same logger level
# (by default production uses :info, the others :debug)
@@ -61,16 +57,6 @@ Rails::Initializer.run do |config|
# config.log_level = :debug
#
# Specify gems that this application depends on and have them installed with rake gems:install
- config.gem "locale", :version => '>=2.0.5'
- config.gem "gettext", :version => '>=1.9.3'
- config.gem "fast_gettext", :version => '>=0.4.8'
- config.gem "rack", :version => '1.1.0'
- config.gem "rdoc", :version => '>=2.4.3'
- config.gem "recaptcha", :lib => "recaptcha/rails"
- config.gem 'rspec', :lib => false, :version => '1.3.1'
- config.gem 'rspec-rails', :lib => false, :version => '1.3.3'
- config.gem 'routing-filter'
- config.gem 'will_paginate', :version => '~> 2.3.11', :source => 'http://gemcutter.org'
#GettextI18nRails.translations_are_html_safe = true
# Use SQL instead of Active Record's schema dumper when creating the test database.
@@ -149,6 +135,7 @@ require 'i18n_fixes.rb'
require 'rack_quote_monkeypatch.rb'
require 'world_foi_websites.rb'
require 'alaveteli_external_command.rb'
+require 'quiet_opener.rb'
ExceptionNotification::Notifier.sender_address = MySociety::Config::get('EXCEPTION_NOTIFICATIONS_FROM')
ExceptionNotification::Notifier.exception_recipients = MySociety::Config::get('EXCEPTION_NOTIFICATIONS_TO')