Merge branch 'deploy_fix_new' into main

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * Update the introduction text
 * Update the alternatives alert
+* Updated capistrano gems
 
 ### 0.3.1
 

Gemfile

@@ -13,6 +13,9 @@ gem "rack_csrf", "~> 2.5.0"
 gem "rack-cors", :require => "rack/cors"
 gem "dotenv", "~> 2.1.0"
 
+gem 'ed25519'
+gem 'bcrypt_pbkdf'
+
 # Database
 gem "pg", "~> 0.18.4"
 gem "activerecord", "~> 4.2.5"
@@ -42,10 +45,10 @@ end
 
 # Deploy
 group :development do
-  gem 'capistrano', '~> 3.4', require: false
-  gem 'capistrano-bundler', '~> 1.1.4', require: false
-  gem 'capistrano-rvm',   '~> 0.1', require: false
+  gem 'capistrano', '~> 3.16.0', require: false
+  gem 'capistrano-bundler', '~> 2.0.1', require: false
+  gem 'capistrano-rvm',   '~> 0.1.2', require: false
   gem 'capistrano-maintenance', '~> 1.0', require: false
-  gem 'capistrano-passenger', '~> 0.2.0', require: false
+  gem 'capistrano-passenger', '~> 0.2.1', require: false
   gem 'byebug', '~> 3.1.2'
 end

Gemfile.lock

@@ -43,6 +43,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    airbrussh (1.4.0)
+      sshkit (>= 1.6.1, != 1.7.0)
     appsignal (1.1.0.beta.5)
       rack
       thread_safe
@@ -51,32 +53,35 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    bcrypt_pbkdf (1.1.0)
     builder (3.2.2)
     byebug (3.1.2)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
-    capistrano (3.4.0)
+    capistrano (3.16.0)
+      airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
-      sshkit (~> 1.3)
-    capistrano-bundler (1.1.4)
+      sshkit (>= 1.9.0)
+    capistrano-bundler (2.0.1)
       capistrano (~> 3.1)
-      sshkit (~> 1.2)
     capistrano-maintenance (1.0.0)
       capistrano (>= 3.0)
-    capistrano-passenger (0.2.0)
+    capistrano-passenger (0.2.1)
       capistrano (~> 3.0)
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     columnize (0.9.0)
+    concurrent-ruby (1.1.9)
     database_cleaner (1.5.1)
     debugger-linecache (1.2.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     dotenv (2.1.0)
+    ed25519 (1.2.4)
     enumerable-lazy (0.0.1)
     equalizer (0.0.11)
     erubis (2.7.0)
@@ -108,7 +113,8 @@ GEM
     grape_logging (1.3.0)
       grape
     hashie (3.4.6)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (1.8.3)
     kaminari (0.16.3)
@@ -128,9 +134,9 @@ GEM
     multi_xml (0.5.5)
     mustermann19 (0.4.4)
       enumerable-lazy
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     pg (0.18.4)
@@ -171,7 +177,7 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     slack-notifier (1.5.1)
-    sshkit (1.8.1)
+    sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     thor (0.19.1)
@@ -194,14 +200,16 @@ DEPENDENCIES
   activerecord-postgis-adapter (~> 3.1.3)
   activesupport (~> 4.2.5)
   appsignal (~> 1.1.0.beta.5)
+  bcrypt_pbkdf
   byebug (~> 3.1.2)
-  capistrano (~> 3.4)
-  capistrano-bundler (~> 1.1.4)
+  capistrano (~> 3.16.0)
+  capistrano-bundler (~> 2.0.1)
   capistrano-maintenance (~> 1.0)
-  capistrano-passenger (~> 0.2.0)
-  capistrano-rvm (~> 0.1)
+  capistrano-passenger (~> 0.2.1)
+  capistrano-rvm (~> 0.1.2)
   database_cleaner (~> 1.5.1)
   dotenv (~> 2.1.0)
+  ed25519
   exception_notification (~> 4.1.4)
   factory_girl (~> 4.0)
   grape (~> 0.17.0)
@@ -219,3 +227,6 @@ DEPENDENCIES
   rake (~> 10.5.0)
   sinatra (~> 1.4.6)
   slack-notifier (~> 1.5.1)
+
+BUNDLED WITH
+   1.12.5

config/deploy.rb

@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock '3.4.0'
+#lock '3.4.0'
 
 set :application, 'protectedplanet-api'
 set :repo_url, '[email protected]:unepwcmc/protectedplanet-api.git'