diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-03-12 13:05:19 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-03-12 13:05:19 +0000 |
| commit | 37bff4c0154b57b35a3194a9b31a9422496b955b (patch) | |
| tree | 61592a6bb9d1d9fea378a6e4efa8fdf7d5525b8a /script/handle-mail-replies | |
| parent | 8b49dc894066e452232cabd09333895487f86986 (diff) | |
| parent | 8acea24f98268fbb9b73b66b9e98a1788a3b30ac (diff) | |
Merge branch 'merged-bundler' into develop
Diffstat (limited to 'script/handle-mail-replies')
| -rwxr-xr-x | script/handle-mail-replies | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/script/handle-mail-replies b/script/handle-mail-replies index 68cab9035..d6717bc58 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 |