diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/handle-mail-replies.rb | 2 | ||||
| -rwxr-xr-x | script/rails-post-deploy | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index 73fca33c3..4e35ee0cf 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -30,7 +30,7 @@ def main(in_test_mode) Dir.chdir($alaveteli_dir) do raw_message = $stdin.read begin - message = MailHandler.mail_from_raw_email(raw_message, decode=false) + message = MailHandler.mail_from_raw_email(raw_message) rescue # Error parsing message. Just pass it on, to be on the safe side. forward_on(raw_message) unless in_test_mode diff --git a/script/rails-post-deploy b/script/rails-post-deploy index abc7fab41..a1c613312 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -76,7 +76,10 @@ if [ "$OPTION_STAGING_SITE" = "0" ] then bundle_install_options="--without development:test --deployment" fi - +if [ "$OPTION_STAGING_SITE" = "1" ] +then + bundle_install_options="--path vendor/bundle" +fi if [ "$TRAVIS" = "true" ] then bundle_install_options="--without development develop --deployment" |