Merge branch 'sh-update-puma' into 'master'

Update puma to v4.3.1 See merge request gitlab-org/gitlab!21234

Merge branch 'sh-update-puma' into 'master'
Update puma to v4.3.1 See merge request gitlab-org/gitlab!21234
9121f475 · Kamil Trzciński · ca41861e · 9303e6ab · 9121f475
Commit 9121f475 authored Dec 05, 2019 by Kamil Trzciński
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -748,7 +748,7 @@ GEM
    pry-rails (0.3.6)
      pry (>= 0.10.4)
    public_suffix (3.1.1)
-    puma (4.3.0)
+    puma (4.3.1)
      nio4r (~> 2.0)
    puma_worker_killer (0.1.1)
      get_process_mem (~> 0.2)