From 7892b17645d6b65ff4eb8629966ee7f64809a12b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Mar 2020 10:39:31 +0000
Subject: [PATCH] Bump puma from 3.11.4 to 3.12.4 in /rails/app7

Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 rails/app7/Gemfile      |  2 +-
 rails/app7/Gemfile.lock | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/rails/app7/Gemfile b/rails/app7/Gemfile
index 30ca1ef..a36a327 100644
--- a/rails/app7/Gemfile
+++ b/rails/app7/Gemfile
@@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 3.12'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
diff --git a/rails/app7/Gemfile.lock b/rails/app7/Gemfile.lock
index cc6d7d9..3d91e4b 100644
--- a/rails/app7/Gemfile.lock
+++ b/rails/app7/Gemfile.lock
@@ -47,6 +47,7 @@ GEM
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
+    bcrypt (3.1.12)
     bcrypt (3.1.12-x64-mingw32)
     bindex (0.5.0)
     bootsnap (1.3.0)
@@ -83,6 +84,7 @@ GEM
     duktape (2.0.1.0)
     erubi (1.7.1)
     execjs (2.7.0)
+    ffi (1.9.23)
     ffi (1.9.23-x64-mingw32)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
@@ -104,15 +106,19 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
+    msgpack (1.2.4)
     msgpack (1.2.4-x64-mingw32)
     multi_json (1.13.1)
+    mysql2 (0.5.1)
     mysql2 (0.5.1-x64-mingw32)
     nio4r (2.3.1)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     nokogiri (1.8.2-x64-mingw32)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
     public_suffix (3.0.2)
-    puma (3.11.4)
+    puma (3.12.4)
     rack (2.0.5)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
@@ -169,6 +175,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
     sqlite3 (1.3.13-x64-mingw32)
     thor (0.20.0)
     thread_safe (0.3.6)
@@ -196,6 +203,7 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
+  ruby
   x64-mingw32
 
 DEPENDENCIES
@@ -208,7 +216,7 @@ DEPENDENCIES
   duktape
   jbuilder (~> 2.5)
   mysql2
-  puma (~> 3.11)
+  puma (~> 3.12)
   rails (~> 5.2.0)
   sass-rails (~> 5.0)
   selenium-webdriver