diff --git a/Gemfile b/Gemfile index 8849e900c..8b3c5866e 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem "autoprefixer-rails", "~> 8.2.0" gem "cancancan", "~> 2.3.0" gem "ckeditor", "~> 4.3.0" gem "cocoon", "~> 1.2.14" -gem "daemons", "~> 1.2.4" +gem "daemons", "~> 1.3.1" gem "dalli", "~> 2.7.6" gem "delayed_job_active_record", "~> 4.1.3" gem "devise", "~> 4.7.1" @@ -93,7 +93,7 @@ group :development do gem "capistrano", "~> 3.10.1", require: false gem "capistrano-bundler", "~> 1.2", require: false gem "capistrano-rails", "~> 1.4.0", require: false - gem "capistrano3-delayed-job", "~> 1.7.3" + gem "capistrano3-delayed-job", "~> 1.7.6" gem "capistrano3-puma", "~> 4.0.0" gem "erb_lint", require: false gem "github_changelog_generator", "~> 1.15.0" diff --git a/Gemfile.lock b/Gemfile.lock index 93a74ddce..97ac31020 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM safely_block (>= 0.1.1) user_agent_parser uuidtools - airbrussh (1.3.0) + airbrussh (1.4.0) sshkit (>= 1.6.1, != 1.7.0) akami (1.3.1) gyoku (>= 0.4.0) @@ -107,9 +107,9 @@ GEM capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano3-delayed-job (1.7.5) + capistrano3-delayed-job (1.7.6) capistrano (~> 3.0, >= 3.0.0) - daemons (~> 1.2.4) + daemons (~> 1.3) capistrano3-puma (4.0.0) capistrano (~> 3.7) capistrano-bundler @@ -153,7 +153,7 @@ GEM thor (~> 0.19.4) tins (~> 1.6) crass (1.0.6) - daemons (1.2.6) + daemons (1.3.1) dalli (2.7.6) database_cleaner (1.7.0) debug_inspector (0.0.3) @@ -352,9 +352,9 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (5.0.2) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) + net-ssh (6.1.0) newrelic_rpm (4.1.0.333) nio4r (2.5.2) nokogiri (1.10.10) @@ -554,7 +554,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.17.0) + sshkit (1.21.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.6.0) @@ -627,14 +627,14 @@ DEPENDENCIES capistrano (~> 3.10.1) capistrano-bundler (~> 1.2) capistrano-rails (~> 1.4.0) - capistrano3-delayed-job (~> 1.7.3) + capistrano3-delayed-job (~> 1.7.6) capistrano3-puma (~> 4.0.0) capybara (~> 3.29.0) capybara-webmock (~> 0.5.3) ckeditor (~> 4.3.0) cocoon (~> 1.2.14) coveralls (~> 0.8.22) - daemons (~> 1.2.4) + daemons (~> 1.3.1) dalli (~> 2.7.6) database_cleaner (~> 1.7.0) delayed_job_active_record (~> 4.1.3)