Merge pull request #31 from eduqg/dependabot/bundler/puma-3.12.2

Bump puma from 3.12.1 to 3.12.2
eduqg · Dec 31, 2019 · 3d4b95e · 3d4b95e
2 parents 87d15c6 + fb46079
commit 3d4b95e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -33,7 +33,7 @@ gem 'travis'
 # Use postgresql as the database for Active Record
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+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
@@ -189,7 +189,7 @@ GEM
  thor
  toml
  public_suffix (4.0.1)
- puma (3.12.1)
+ puma (3.12.2)
  puma_worker_killer (0.1.1)
  get_process_mem (~> 0.2)
  puma (>= 2.7, < 5)
@@ -387,7 +387,7 @@ DEPENDENCIES
  listen (>= 3.0.5, < 3.2)
  pg (>= 0.18, < 2.0)
  popper (~> 0.5.0)
- puma (~> 3.11)
+ puma (~> 3.12)
  puma_worker_killer
  rails (~> 5.2.1)
  rails-controller-testing