From a23ed38e5d3c9a9e005f04f4bcb75a06645ddea7 Mon Sep 17 00:00:00 2001 From: Priit Tamboom Date: Thu, 25 Sep 2014 11:52:32 +0300 Subject: [PATCH 1/2] Mina deploy assets fixed --- config/deploy.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index 377b6060d..1da9b7804 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -21,8 +21,7 @@ set :shared_paths, [ 'config/database.yml', 'config/secrets.yml', 'log', - 'public/system', - 'public/assets' + 'public/system' ] # Optional settings: @@ -50,6 +49,12 @@ task :setup => :environment do queue! %[mkdir -p "#{deploy_to}/shared/config"] queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config"] + queue! %[mkdir -p "#{deploy_to}/shared/public"] + queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/public"] + + queue! %[mkdir -p "#{deploy_to}/shared/public/system"] + queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/public/system"] + queue! %[touch "#{deploy_to}/shared/config/database.yml"] queue %[echo "-----> Be sure to edit 'shared/config/database.yml'."] end From 7c8e7e22af19e1060ecca1f55870f7db07577152 Mon Sep 17 00:00:00 2001 From: Priit Tamboom Date: Thu, 25 Sep 2014 12:10:56 +0300 Subject: [PATCH 2/2] fixing deploy rake --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 963a1e68f..fe9578694 100644 --- a/Gemfile +++ b/Gemfile @@ -84,8 +84,8 @@ group :development, :test do # For feature testing # gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks gem 'phantomjs-binaries', '~> 1.9.2.4' - gem 'phantomjs', '~> 1.9.7.1', require: 'phantomjs/poltergeist' gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead + gem 'phantomjs', '~> 1.9.7.1' # For cleaning db in feature and epp tests gem 'database_cleaner', '~> 1.3.0'