From 38a6a76e6efa06426f8afe0f0ea2aef6498af628 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Tue, 2 Apr 2019 21:10:35 +0000
Subject: [PATCH] Bump puma from 3.12.0 to 3.12.1

Bumps [puma](https://github.com/puma/puma) from 3.12.0 to 3.12.1.
- [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.1)

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

diff --git a/Gemfile b/Gemfile
index 53865ad5..7100d4b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem "aasm", '~> 3.4.0'
 gem "htmlentities"
 gem "swf_fu"
 gem "rails_autolink"
-gem 'puma', '~> 3.0'
+gem 'puma', '~> 3.12'
 gem 'paperclip'
 
 # To use ActiveModel has_secure_password
diff --git a/Gemfile.lock b/Gemfile.lock
index c6a69059..f6b5cf3f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,7 +147,7 @@ GEM
       ast (~> 2.4.0)
     powerpack (0.1.2)
     psych (3.1.0)
-    puma (3.12.0)
+    puma (3.12.1)
     rack (2.0.6)
     rack-mini-profiler (1.0.2)
       rack (>= 1.2.0)
@@ -297,7 +297,7 @@ DEPENDENCIES
   mocha
   mysql2 (~> 0.5.2)
   paperclip
-  puma (~> 3.0)
+  puma (~> 3.12)
   rack-mini-profiler
   rails (~> 5.2.2)
   rails-controller-testing