Merge branch 'develop' into purge-requests

Conflicts:
	spec/controllers/request_controller_spec.rb

1 files changed, 2 insertions, 8 deletions

diff --git a/script/handle-mail-replies b/script/handle-mail-replies
index 68cab9035..cc7595bed 100755
--- a/script/handle-mail-replies
+++ b/script/handle-mail-replies
@@ -18,13 +18,7 @@ load "config.rb"
 MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true)
 MySociety::Config.load_default
 
-require 'rubygems'
-if File.exist? File.join($alaveteli_dir,'vendor','rails','Rakefile')
-    $:.push(File.join($alaveteli_dir, "vendor", "rails", "actionmailer", "lib", "action_mailer", "vendor", "tmail-1.2.7"))
-    require 'tmail'
-else
-    require 'action_mailer'
-end
+require 'action_mailer'
 
 def main(in_test_mode)
     Dir.chdir($alaveteli_dir) do
@@ -151,7 +145,7 @@ end
 
 def load_rails
     require File.join('config', 'boot')
-    require RAILS_ROOT + '/config/environment'
+    require Rails.root + '/config/environment'
 end
 
 def record_bounce(email_address, bounce_message)