Skip to content

Commit

Permalink
Merge pull request #147 from openpolitics/bump/bundler/puma-3.8.2
Browse files Browse the repository at this point in the history
Bump puma to 3.8.2
  • Loading branch information
Floppy committed May 30, 2017
2 parents eca8469 + 0bd4adb commit 0a4e090
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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.4.1"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0'
# Use Puma as the app server
gem 'puma', '~> 3.0'
gem 'puma', '~> 3.8'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ GEM
orm_adapter (0.5.0)
pg (0.19.0)
public_suffix (2.0.5)
puma (3.7.1)
puma (3.8.2)
rack (2.0.3)
rack-protection (1.5.3)
rack
Expand Down Expand Up @@ -312,7 +312,7 @@ DEPENDENCIES
octokit (~> 4.0)
omniauth-github
pg
puma (~> 3.0)
puma (~> 3.8)
rails (~> 5.0)
redcarpet
rinku
Expand Down

0 comments on commit 0a4e090

Please sign in to comment.