logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: a6a206ef850da46a1fbdf262fe4527a44f2ceb0f
parent: bbff144004b6e162d9a27720b975a4953182da70
Author: Grey Baker <greysteil@gmail.com>
Date:   Mon, 11 Sep 2017 22:43:19 +0100

Bump puma from 3.9.1 to 3.10.0 (#4879)

Bumps [puma](https://github.com/puma/puma) from 3.9.1 to 3.10.0.
- [Release notes](https://github.com/puma/puma/releases/tag/v3.10.0)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.9.1...v3.10.0)

Diffstat:

MGemfile2+-
MGemfile.lock4++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile @@ -5,7 +5,7 @@ ruby '>= 2.3.0', '< 2.5.0' gem 'pkg-config', '~> 1.2' -gem 'puma', '~> 3.8' +gem 'puma', '~> 3.10' gem 'rails', '~> 5.1.4' gem 'uglifier', '~> 3.2' diff --git a/Gemfile.lock b/Gemfile.lock @@ -323,7 +323,7 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.0.0) - puma (3.9.1) + puma (3.10.0) pundit (1.1.0) activesupport (>= 3.0.0) rabl (0.13.1) @@ -582,7 +582,7 @@ DEPENDENCIES pghero (~> 1.7) pkg-config (~> 1.2) pry-rails (~> 0.3) - puma (~> 3.8) + puma (~> 3.10) pundit (~> 1.1) rabl (~> 0.13) rack-attack (~> 5.0)