From 310da9740a58e79ee3420e0e398fea8e37e0788b Mon Sep 17 00:00:00 2001 From: ojab Date: Wed, 3 Jun 2015 16:50:49 +0000 Subject: [PATCH] Remove 'vendor/bundle' from default :linked_dirs capistrano-bundler uses "#{fetch(:deploy_to)}/shared/bundle" directory --- CHANGELOG.md | 1 + lib/capistrano/templates/deploy.rb.erb | 2 +- spec/support/test_app.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22e36cfc..521ba794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Reverse Chronological Order: https://github.com/capistrano/capistrano/compare/v3.4.0...HEAD +* Remove 'vendor/bundle' from default :linked_dirs (@ojab) * Removed the post-install message (@Kriechi) * Minor changes diff --git a/lib/capistrano/templates/deploy.rb.erb b/lib/capistrano/templates/deploy.rb.erb index 49a37724..1a38af78 100644 --- a/lib/capistrano/templates/deploy.rb.erb +++ b/lib/capistrano/templates/deploy.rb.erb @@ -26,7 +26,7 @@ set :repo_url, 'git@example.com:me/my_repo.git' # set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/secrets.yml') # Default value for linked_dirs is [] -# set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'vendor/bundle', 'public/system') +# set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system') # Default value for default_env is {} # set :default_env, { path: "/opt/ruby/bin:$PATH" } diff --git a/spec/support/test_app.rb b/spec/support/test_app.rb index c5d9eaac..7cb49c59 100644 --- a/spec/support/test_app.rb +++ b/spec/support/test_app.rb @@ -29,7 +29,7 @@ module TestApp end def linked_dirs - %w{bin log public/system vendor/bundle} + %w{bin log public/system} end def create_test_app