Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump puma from 2.11.2 to 4.3.9 #994

Closed
wants to merge 1 commit into from
Closed

Bump puma from 2.11.2 to 4.3.9 #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ gem "pry"
# Needed for a smooth upgrade from Rails 3.2 to Rails 4.0
# http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html
gem 'protected_attributes'
gem "puma", "2.11.2"
gem "puma", "4.3.9"
gem "pundit"
gem "rack-cors", :require => false
gem 'rails', "4.2"
Expand Down
15 changes: 9 additions & 6 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
haml (4.0.7)
haml (5.1.2)
temple (>= 0.8.0)
tilt
heapy (0.1.3)
hitimes (1.2.2)
Expand Down Expand Up @@ -169,6 +170,7 @@ GEM
multi_json (1.11.2)
nenv (0.2.0)
newrelic_rpm (3.13.0.299)
nio4r (2.5.8)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
notiffany (0.0.7)
Expand All @@ -191,11 +193,11 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
puma (2.11.2)
rack (>= 1.1, < 2.0)
puma (4.3.9)
nio4r (~> 2.0)
pundit (1.0.1)
activesupport (>= 3.0.0)
rack (1.6.8)
rack (1.6.13)
rack-cache (1.2)
rack (>= 0.4)
rack-cors (0.4.0)
Expand Down Expand Up @@ -310,6 +312,7 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
temple (0.8.2)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
Expand Down Expand Up @@ -358,7 +361,7 @@ DEPENDENCIES
foreman
google-analytics-rails (= 1.1.1)
guard-rspec
haml
haml (= 5.1.2)
http_accept_language
jbuilder
jquery-rails
Expand All @@ -373,7 +376,7 @@ DEPENDENCIES
poltergeist
protected_attributes
pry
puma (= 2.11.2)
puma (= 4.3.9)
pundit
rack-cache
rack-cors
Expand Down