From 7a38ede33f16fe48de22a9ba41ef73ca961a6d79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Aug 2021 23:54:14 +0000
Subject: [PATCH 1/3] Bump capistrano3-puma from 4.0.0 to 5.0.4

Bumps [capistrano3-puma](https://github.com/seuros/capistrano-puma) from 4.0.0 to 5.0.4.
- [Release notes](https://github.com/seuros/capistrano-puma/releases)
- [Changelog](https://github.com/seuros/capistrano-puma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seuros/capistrano-puma/compare/v4.0.0...v5.0.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5e092b291..836bd07fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -98,7 +98,7 @@ group :development do
   gem "capistrano-bundler", "~> 2.0", require: false
   gem "capistrano-rails", "~> 1.6.1", require: false
   gem "capistrano3-delayed-job", "~> 1.7.6"
-  gem "capistrano3-puma", "~> 4.0.0"
+  gem "capistrano3-puma", "~> 5.0.4"
   gem "erb_lint", "~> 0.0.37", require: false
   gem "github_changelog_generator", "~> 1.15.2"
   gem "mdl", "~> 0.11.0", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index f8415b264..47998b2bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,10 +109,10 @@ GEM
     capistrano3-delayed-job (1.7.6)
       capistrano (~> 3.0, >= 3.0.0)
       daemons (~> 1.3)
-    capistrano3-puma (4.0.0)
+    capistrano3-puma (5.0.4)
       capistrano (~> 3.7)
       capistrano-bundler
-      puma (~> 4.0)
+      puma (>= 4.0, < 6.0)
     capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
@@ -713,7 +713,7 @@ DEPENDENCIES
   capistrano-bundler (~> 2.0)
   capistrano-rails (~> 1.6.1)
   capistrano3-delayed-job (~> 1.7.6)
-  capistrano3-puma (~> 4.0.0)
+  capistrano3-puma (~> 5.0.4)
   capybara (~> 3.35.3)
   capybara-webmock (~> 0.5.5)
   caxlsx (~> 3.0.2)

From 0a53f438c00b51ed98580cb0acfd3b23489a1965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Wed, 11 Aug 2021 02:32:20 +0200
Subject: [PATCH 2/3] Update Capfile to use the current capistrano

We forgot to do so when updating Capistrano in commit c1491a7ce.
---
 config/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 417cf3a99..0273ee204 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock "~> 3.14.1"
+lock "~> 3.16.0"
 
 def deploysecret(key)
   @deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml")[fetch(:stage).to_s]

From 8942e9baf872f2947fe7d0daf2b69f9f7371a604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Wed, 11 Aug 2021 02:36:41 +0200
Subject: [PATCH 3/3] Configure Capistrano to use Puma as a daemon

Since Puma 5.x will remove support for running Puma as a daemon,
capistrano-puma requires defining whether we want to run Puma as a
daemon (as we've been doing so far with Puma 4.x) or to uses systemd.

We'll change this code to uses systemd when upgrading to Puma 5.x.
---
 Capfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Capfile b/Capfile
index e47ebb4fd..ddb830a70 100644
--- a/Capfile
+++ b/Capfile
@@ -14,6 +14,7 @@ require "rvm1/capistrano3"
 
 require "capistrano/puma"
 install_plugin Capistrano::Puma, load_hooks: false
+install_plugin Capistrano::Puma::Daemon
 
 #SCM: Git
 require "capistrano/scm/git"