Skip to content

Commit

Permalink
Revert "Bump puma from 3.11.4 to 3.12.0 (mastodon#8883)"
Browse files Browse the repository at this point in the history
This reverts commit a1b9044.
  • Loading branch information
lindwurm committed Nov 1, 2018
1 parent b76f750 commit 7e6a040
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ruby '>= 2.3.0', '< 2.6.0'

gem 'pkg-config', '~> 1.3'

gem 'puma', '~> 3.12'
gem 'puma', '~> 3.11'
gem 'rails', '~> 5.2.1'
gem 'thor', '~> 0.20'

Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ GEM
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.2)
puma (3.12.0)
puma (3.11.4)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (2.0.5)
Expand Down Expand Up @@ -721,7 +721,7 @@ DEPENDENCIES
private_address_check (~> 0.4.1)
pry-byebug (~> 3.6)
pry-rails (~> 0.3)
puma (~> 3.12)
puma (~> 3.11)
pundit (~> 1.1)
rack-attack (~> 5.2)
rack-cors (~> 1.0)
Expand Down Expand Up @@ -765,4 +765,4 @@ RUBY VERSION
ruby 2.5.0p0

BUNDLED WITH
1.16.5
1.16.3

0 comments on commit 7e6a040

Please sign in to comment.