From f527325f1624cfb801ed066c135329c13ce549c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 12:44:45 +0000
Subject: [PATCH] Bump puma from 3.12.0 to 3.12.6

Bumps [puma](https://github.com/puma/puma) from 3.12.0 to 3.12.6.
- [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.12.0...v3.12.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 56b663b..f17058e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ ruby '2.5.3'
 gem 'rails', '~> 5.2.0'
 
 # API/Server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 3.12'
 gem 'grape'
 gem 'grape-swagger'
 gem 'grape-middleware-logger'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b7c7fa..0f468ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -288,7 +288,9 @@ GEM
     marcel (0.3.2)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.2)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
@@ -320,7 +322,7 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.2)
-    puma (3.12.0)
+    puma (3.12.6)
     rack (2.0.7)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -552,7 +554,7 @@ DEPENDENCIES
   pg (>= 0.18, < 2.0)
   pry-byebug
   pry-rails
-  puma (~> 3.11)
+  puma (~> 3.12)
   rails (~> 5.2.0)
   ransack
   react-rails