diff --git a/Capfile b/Capfile index 86e5243c..e67a47a0 100644 --- a/Capfile +++ b/Capfile @@ -5,3 +5,6 @@ require 'capistrano/puma/nginx' require 'capistrano/rails' require 'capistrano/rvm' require 'capistrano/upload-config' + +install_plugin Capistrano::Puma +install_plugin Capistrano::Puma::Nginx diff --git a/Gemfile b/Gemfile index 8133baa4..738b5325 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,7 @@ gem 'rubyzip' group :development, :staging do gem 'better_errors', platform: :ruby gem 'binding_of_caller', platform: :ruby - gem 'capistrano', '~> 3.3.0' + gem 'capistrano' gem 'capistrano3-puma' gem 'capistrano-rails' gem 'capistrano-rvm' diff --git a/Gemfile.lock b/Gemfile.lock index 130c8d7f..1dd54581 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,6 +43,8 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + airbrussh (1.3.0) + sshkit (>= 1.6.1, != 1.7.0) arel (6.0.4) ast (2.4.0) autotest-rails (4.2.1) @@ -61,11 +63,11 @@ GEM rails (>= 3.2) builder (3.2.3) byebug (10.0.0) - capistrano (3.3.5) - capistrano-stats (~> 1.1.0) + capistrano (3.10.1) + airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) - sshkit (~> 1.3) + sshkit (>= 1.9.0) capistrano-bundler (1.3.0) capistrano (~> 3.1) sshkit (~> 1.2) @@ -75,12 +77,12 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano-stats (1.1.1) capistrano-upload-config (0.8.2) capistrano (>= 3.0) - capistrano3-puma (1.2.1) - capistrano (~> 3.0) - puma (>= 2.6) + capistrano3-puma (3.1.1) + capistrano (~> 3.7) + capistrano-bundler + puma (~> 3.4) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -394,7 +396,7 @@ DEPENDENCIES bootstrap-will_paginate bootstrap_pagedown byebug - capistrano (~> 3.3.0) + capistrano capistrano-rails capistrano-rvm capistrano-upload-config