gem upgrade:

puma bundler bcrypt
yeti-switch · Feb 19, 2020 · 8ad9c00 · 8ad9c00
1 parent 905d406
commit 8ad9c00
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -72,7 +72,7 @@ gem 'uglifier', '>= 1.3'
 gem 'daemons'
 gem 'delayed_job_active_record'
 gem 'odf-report', git: 'https://github.com/yeti-switch/odf-report.git', branch: 'master-2018'
-gem 'puma'
+gem 'puma', '~> 4.3'
 gem 'puma_worker_killer'
 gem 'syslog-logger'
 gem 'zip-zip'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     awesome_print (1.8.0)
-    bcrypt (3.1.11)
+    bcrypt (3.1.13)
     bootsnap (1.3.2)
       msgpack (~> 1.0)
     builder (3.2.3)
@@ -271,7 +271,8 @@ GEM
     formtastic (3.1.5)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
-    get_process_mem (0.2.3)
+    get_process_mem (0.2.5)
+      ffi (~> 1.0)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
@@ -359,10 +360,11 @@ GEM
     powerpack (0.1.2)
     prometheus_exporter (0.4.14)
     public_suffix (3.0.3)
-    puma (3.12.2)
-    puma_worker_killer (0.1.0)
+    puma (4.3.1)
+      nio4r (~> 2.0)
+    puma_worker_killer (0.1.1)
       get_process_mem (~> 0.2)
-      puma (>= 2.7, < 4)
+      puma (>= 2.7, < 5)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
     rack (2.0.8)
@@ -573,7 +575,7 @@ DEPENDENCIES
   pg
   postgres_ext!
   prometheus_exporter
-  puma
+  puma (~> 4.3)
   puma_worker_killer
   pundit
   rails (~> 5.2.3)
@@ -600,4 +602,4 @@ DEPENDENCIES
   zip-zip
 
 BUNDLED WITH
-   2.0.2
+   2.1.4
diff --git a/Makefile b/Makefile
@@ -99,7 +99,7 @@ config/policy_roles.yml:
 .PHONY: bundler
 bundler:
 	$(info:msg=Install bundler)
-	gem install --no-document --install-dir $(gems) bundler -v 2.0.2
+	gem install --no-document --install-dir $(gems) bundler -v 2.1.4
 
 
 .PHONY: gems

diff --git a/pgq-processors/Gemfile.lock b/pgq-processors/Gemfile.lock
@@ -119,4 +119,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.0.2
+   2.1.4
diff --git a/pgq-processors/Makefile b/pgq-processors/Makefile
@@ -17,7 +17,7 @@ all: gems
 .PHONY: bundler
 bundler:
 	$(info:msg=Install bundler)
-	gem install --no-document --install-dir $(gems) bundler -v 2.0.2
+	gem install --no-document --install-dir $(gems) bundler -v 2.1.4
 
 
 .PHONY: gems
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,4 +119,4 @@ DEPENDENCIES @@
       webmock
     BUNDLED WITH
-.0.2
+.1.4