Merge pull request #4418 from consul/dependabot/bundler/capistrano3-puma-5.0.4
Bump capistrano3-puma from 4.0.0 to 5.0.4
This commit is contained in:
1
Capfile
1
Capfile
@@ -14,6 +14,7 @@ require "rvm1/capistrano3"
|
|||||||
|
|
||||||
require "capistrano/puma"
|
require "capistrano/puma"
|
||||||
install_plugin Capistrano::Puma, load_hooks: false
|
install_plugin Capistrano::Puma, load_hooks: false
|
||||||
|
install_plugin Capistrano::Puma::Daemon
|
||||||
|
|
||||||
#SCM: Git
|
#SCM: Git
|
||||||
require "capistrano/scm/git"
|
require "capistrano/scm/git"
|
||||||
|
|||||||
2
Gemfile
2
Gemfile
@@ -98,7 +98,7 @@ group :development do
|
|||||||
gem "capistrano-bundler", "~> 2.0", require: false
|
gem "capistrano-bundler", "~> 2.0", require: false
|
||||||
gem "capistrano-rails", "~> 1.6.1", require: false
|
gem "capistrano-rails", "~> 1.6.1", require: false
|
||||||
gem "capistrano3-delayed-job", "~> 1.7.6"
|
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 "erb_lint", "~> 0.0.37", require: false
|
||||||
gem "github_changelog_generator", "~> 1.15.2"
|
gem "github_changelog_generator", "~> 1.15.2"
|
||||||
gem "mdl", "~> 0.11.0", require: false
|
gem "mdl", "~> 0.11.0", require: false
|
||||||
|
|||||||
@@ -109,10 +109,10 @@ GEM
|
|||||||
capistrano3-delayed-job (1.7.6)
|
capistrano3-delayed-job (1.7.6)
|
||||||
capistrano (~> 3.0, >= 3.0.0)
|
capistrano (~> 3.0, >= 3.0.0)
|
||||||
daemons (~> 1.3)
|
daemons (~> 1.3)
|
||||||
capistrano3-puma (4.0.0)
|
capistrano3-puma (5.0.4)
|
||||||
capistrano (~> 3.7)
|
capistrano (~> 3.7)
|
||||||
capistrano-bundler
|
capistrano-bundler
|
||||||
puma (~> 4.0)
|
puma (>= 4.0, < 6.0)
|
||||||
capybara (3.35.3)
|
capybara (3.35.3)
|
||||||
addressable
|
addressable
|
||||||
mini_mime (>= 0.1.3)
|
mini_mime (>= 0.1.3)
|
||||||
@@ -713,7 +713,7 @@ DEPENDENCIES
|
|||||||
capistrano-bundler (~> 2.0)
|
capistrano-bundler (~> 2.0)
|
||||||
capistrano-rails (~> 1.6.1)
|
capistrano-rails (~> 1.6.1)
|
||||||
capistrano3-delayed-job (~> 1.7.6)
|
capistrano3-delayed-job (~> 1.7.6)
|
||||||
capistrano3-puma (~> 4.0.0)
|
capistrano3-puma (~> 5.0.4)
|
||||||
capybara (~> 3.35.3)
|
capybara (~> 3.35.3)
|
||||||
capybara-webmock (~> 0.5.5)
|
capybara-webmock (~> 0.5.5)
|
||||||
caxlsx (~> 3.0.2)
|
caxlsx (~> 3.0.2)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# config valid only for current version of Capistrano
|
# config valid only for current version of Capistrano
|
||||||
lock "~> 3.14.1"
|
lock "~> 3.16.0"
|
||||||
|
|
||||||
def deploysecret(key)
|
def deploysecret(key)
|
||||||
@deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml")[fetch(:stage).to_s]
|
@deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml")[fetch(:stage).to_s]
|
||||||
|
|||||||
Reference in New Issue
Block a user