Skip to content

Commit d0b156f

Browse files
authored
Merge pull request #3 from Danielshow/dependabot/bundler/puma-3.12.2
Bump puma from 3.12.1 to 3.12.2
2 parents 1e8f438 + 7aa16b8 commit d0b156f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem 'rails', '~> 6.0.0.rc1'
88
# Use postgresql as the database for Active Record
99
gem 'pg', '>= 0.18', '< 2.0'
1010
# Use Puma as the app server
11-
gem 'puma', '~> 3.11'
11+
gem 'puma', '~> 3.12'
1212
# Use SCSS for stylesheets
1313
gem 'sass-rails', '~> 5'
1414
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ GEM
9292
nokogiri (1.10.3)
9393
mini_portile2 (~> 2.4.0)
9494
pg (1.1.4)
95-
puma (3.12.1)
95+
puma (3.12.2)
9696
rack (2.0.7)
9797
rack-proxy (0.6.5)
9898
rack
@@ -182,7 +182,7 @@ DEPENDENCIES
182182
jbuilder (~> 2.5)
183183
listen (>= 3.0.5, < 3.2)
184184
pg (>= 0.18, < 2.0)
185-
puma (~> 3.11)
185+
puma (~> 3.12)
186186
rails (~> 6.0.0.rc1)
187187
sass-rails (~> 5)
188188
spring

0 commit comments

Comments
 (0)