sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of /Users/jesser/Dropbox/git-repo/contactorama

Browse source
This commit is contained in:
Roland Jesse 2012-05-29 20:14:44 +02:00
commit 1528bb354f
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Capfile
View file

@ -2,4 +2,3 @@ load 'deploy' if respond_to?(:namespace) # cap2 differentiator
Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
load 'config/deploy' # remove this line to skip loading any of the default tasks
load 'deploy/assets' # see http://guides.rubyonrails.org/asset_pipeline.html

6
config/deploy.rb
View file

@ -1,10 +1,6 @@
# Commented out as capistrano cannot finde 'bundle' on production site.
# require 'bundler/capistrano'
# Precompile all assets
# If this takes too long, do this: http://www.bencurtis.com/2011/12/skipping-asset-compilation-with-capistrano/
# load "deploy/assets"
set :application, "contactorama"
set :local_repository, "web1@railshosting.de:/files/repositories/git/contactorama.git"
set :repository, "/var/www/htdocs/web1/files/repositories/git/contactorama.git"
@ -66,7 +62,7 @@ namespace :assets do
desc "precompile assets"
task :precompile do
run_locally("bundle exec rake assets:clean && bundle exec rake assets:precompile RAILS_ENV=#{rails_env}")
run_locally("bundle exec rake assets:clean && bundle exec rake assets:precompile")
end
desc "precompile and upload assets to webserver"