summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2019-12-07 11:37:47 -0700
committerGitHub <noreply@github.com>2019-12-07 11:37:47 -0700
commit64dfda85612dbd6287f16bfa62c92dbcdb5b6a14 (patch)
tree3d00bb306deac205722fb9346cf89b02bbddc428
parent8daa9bce94414d341c3fa86d5abbf981a2ed64d6 (diff)
parent6ca732b9b72458e6431be7ed686a06cb4668f3f5 (diff)
Merge pull request #4 from saml-kit/dependabot/bundler/puma-3.12.2
Bump puma from 3.12.0 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 474137e..16af45d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.4'
# Use Puma as the app server
-gem 'puma', '~> 3.7'
+gem 'puma', '~> 3.12'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
diff --git a/Gemfile.lock b/Gemfile.lock
index 53fb2b1..bcfe646 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,7 +107,7 @@ GEM
mini_portile2 (~> 2.4.0)
pg (1.1.4)
public_suffix (3.0.3)
- puma (3.12.0)
+ puma (3.12.2)
rack (2.0.6)
rack-test (1.1.0)
rack (>= 1.0, < 3)
@@ -246,7 +246,7 @@ DEPENDENCIES
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
pg
- puma (~> 3.7)
+ puma (~> 3.12)
rails (~> 5.1.4)
rails-assets-bootstrap!
rails-assets-jquery!