diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-08-05 16:54:31 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-08-05 16:54:31 +0100 |
| commit | 1981ef1baa9a0be88c95fe0f9a3ff4f1d0bdb008 (patch) | |
| tree | 0182699b2eb63eb4c455027e6c4ea43da04c54ba | |
| parent | b53cde9ff491f950fb7fa6904549bfc819144b46 (diff) | |
| parent | c43deed5550583ee8a304e80ae248f18b271be9f (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/alaveteli
| -rw-r--r-- | config/packages | 4 | ||||
| -rwxr-xr-x | script/rails-post-deploy | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/config/packages b/config/packages index f4d0a674c..5d6622c30 100644 --- a/config/packages +++ b/config/packages @@ -4,8 +4,8 @@ ruby1.8 ruby libopenssl-ruby1.8 # needed for Ubuntu 10.04 TLS; included in libruby1.8 in Squeeze -rdoc -irb +rdoc | rdoc1.8 +irb | irb1.8 wv poppler-utils pdftk (>> 1.41+dfsg-1) | pdftk (<< 1.41+dfsg-1) # that version has a non-functionining uncompress option diff --git a/script/rails-post-deploy b/script/rails-post-deploy index a3257cf35..f7ed8178b 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -91,9 +91,7 @@ then fi bundle install $bundle_install_options -bundle exec rake themes:install - # upgrade database bundle exec rake db:migrate #--trace - +bundle exec rake themes:install |