Permalink
Browse files

Merge pull request #30712 from maschwenk/5-1-stable

Backport Capybara :puma defaults to 5.1.x
  • Loading branch information...
eileencodes committed Sep 28, 2017
2 parents 731c7f9 + 87e085d commit bc02a011d397cc4fa92724c977c91e1d75d681a1
Showing with 6 additions and 0 deletions.
  1. +4 −0 actionpack/CHANGELOG.md
  2. +2 −0 actionpack/lib/action_dispatch/system_testing/server.rb
View
@@ -1,3 +1,7 @@
* Ensure dev and prod puma configs do not clobber `ActionDispatch::SystemTesting` defaults. Adds workers: 0 and daemon: false
*Max Schwenk*
## Rails 5.1.4 (September 07, 2017) ##
* Make `take_failed_screenshot` work within engine.
@@ -21,6 +21,8 @@ def register
app,
Port: port,
Threads: "0:1",
workers: 0,
daemon: false,
Silent: self.class.silence_puma
)
end

0 comments on commit bc02a01

Please sign in to comment.