diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-02-15 17:40:04 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-02-15 17:59:06 +1100 |
| commit | a0f250204a376ce97a187cf8a9b2cb0b8c628298 (patch) | |
| tree | 812504a7b8da2431b3fed6f38f6796cdbbc84e00 /script/rails-post-deploy | |
| parent | 8f1caab7990dc417e32b14cbb5f00c34a0ddc10c (diff) | |
| parent | d16f2f8242352a2d3c0350275110453dd6ac6b12 (diff) | |
Merge branch 'develop' into rails-3-spike
Conflicts:
Gemfile
Gemfile.lock
app/controllers/general_controller.rb
app/controllers/track_controller.rb
app/models/outgoing_message.rb
app/models/public_body.rb
app/models/user.rb
app/views/general/frontpage.rhtml
config/environment.rb
config/initializers/inflections.rb
config/initializers/mime_types.rb
db/migrate/094_remove_old_tags_foreign_key.rb
lib/timezone_fixes.rb
spec/models/request_mailer_spec.rb
spec/views/request/list.rhtml_spec.rb
Diffstat (limited to 'script/rails-post-deploy')
| -rwxr-xr-x | script/rails-post-deploy | 5 |
1 files changed, 4 insertions, 1 deletions
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" |