diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-02-14 16:48:08 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-02-14 16:48:08 +0000 |
| commit | d48bfd58f6ff26b2a34aa8d71d9d691f9fbc10e2 (patch) | |
| tree | c026e8e6639f7f9ceed92b75fb8ed657c566d788 /script | |
| parent | f8cf582f8c7461bfd680aac9c87cb5377c39c30c (diff) | |
| parent | 0747a2d66f65fd22d8ea275d9df29a7981a46d07 (diff) | |
Merge branch 'release/0.7' into wdtk
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" |