summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2019-12-07 11:38:27 -0700
committerGitHub <noreply@github.com>2019-12-07 11:38:27 -0700
commit7aa9938e8f06008ae0a81dabfb83a663d9465c2c (patch)
tree5518d421f94135edfe1ca90bcdb8a68ef3a52f83
parent69f407c15124a4049d21eda365c575394aced445 (diff)
parentf2053698fd56a5ae8f8d3205b2fdb2cf8a8b40e1 (diff)
Merge pull request #1 from saml-kit/dependabot/bundler/puma-3.12.2
Bump puma from 3.12.1 to 3.12.2
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index b2236f7..5b40552 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'jbuilder', '~> 2.5'
gem 'jwt', '~> 2.1'
gem 'local_time', '~> 2.1'
gem 'pg'
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 3.12'
gem 'rails', '~> 6.0.0'
gem 'rotp', '~> 3.3'
gem 'saml-kit', '~> 1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1cefee0..42142e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,7 +215,7 @@ GEM
forwardable-extended (~> 2.6)
pg (1.1.4)
public_suffix (4.0.1)
- puma (3.12.1)
+ puma (3.12.2)
rack (2.0.7)
rack-proxy (0.6.5)
rack
@@ -397,7 +397,7 @@ DEPENDENCIES
local_time (~> 2.1)
minima (~> 2.0)
pg
- puma (~> 3.11)
+ puma (~> 3.12)
rails (~> 6.0.0)
rails_12factor (~> 0.0)
rotp (~> 3.3)