diff --git a/Capfile b/Capfile index 3a50fba..257fe45 100644 --- a/Capfile +++ b/Capfile @@ -22,10 +22,9 @@ require 'capistrano/bundler' require 'capistrano/rails/assets' require 'capistrano/rails/migrations' require 'capistrano/puma' -require 'capistrano/puma/nginx' # if you want to upload a nginx site template +# require 'capistrano/puma/nginx' # if you want to upload a nginx site template # require 'capistrano/passenger' require 'capistrano/rvm' -require 'capistrano/git-submodule-strategy' # Load custom tasks from `lib/capistrano/tasks` if you have any defined Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r } diff --git a/Gemfile b/Gemfile index d02cb59..d5a5182 100644 --- a/Gemfile +++ b/Gemfile @@ -58,7 +58,6 @@ group :development do gem 'capistrano-rails' gem 'capistrano-rvm' gem 'capistrano3-puma' - gem 'capistrano-git-submodule-strategy' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 728b463..79c6260 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,8 +64,6 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-git-submodule-strategy (0.1.17) - capistrano (~> 3.1) capistrano-rails (1.1.3) capistrano (~> 3.1) capistrano-bundler (~> 1.1) @@ -347,7 +345,6 @@ DEPENDENCIES bootstrap-sass-extras bootswatch-rails capistrano - capistrano-git-submodule-strategy capistrano-rails capistrano-rvm capistrano3-puma diff --git a/config/deploy.rb b/config/deploy.rb index 3a40ff2..30a65c2 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -12,7 +12,6 @@ set :deploy_to, '/home/barf/clarion' # Default value for :scm is :git # set :scm, :git -set :git_strategy, Capistrano::Git::SubmoduleStrategy # Default value for :format is :pretty # set :format, :pretty