diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:59:54 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:59:54 +0100 |
| commit | 7d0fea4b38c214a67b2fc4b56aa670e02a3cda61 (patch) | |
| tree | 85e77cf7ba0656efbacf1497baff2ef96887bd3b /script | |
| parent | 6ef57090e436e01bc5de801bc7acb6bfadb5c490 (diff) | |
| parent | 6c4c822ef7a4491bf821326af779e5be9118c0a1 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'script')
| -rwxr-xr-x | script/handle-mail-replies | 2 | ||||
| -rwxr-xr-x | script/handle-mail-replies.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/script/handle-mail-replies b/script/handle-mail-replies index ad4b3719e..7006b83dd 100755 --- a/script/handle-mail-replies +++ b/script/handle-mail-replies @@ -1,4 +1,4 @@ #!/bin/bash cd "`dirname "$0"`" -exec bundle exec ./handle-mail-replies.rb +exec bundle exec ./handle-mail-replies.rb $@ diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index cc15fe35a..eba6f44cf 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -167,7 +167,7 @@ end def load_rails require File.join('config', 'boot') - require Rails.root + '/config/environment' + require File.join('config', 'environment') end def record_bounce(email_address, bounce_message) |