diff options
| author | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
|---|---|---|
| committer | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
| commit | 0f28957edd6a9c281491c854b455180efc040a1c (patch) | |
| tree | 577d46d88937d4cc811e6860ce3cbdb2a1dad27a /actionpack/lib/action_dispatch/system_testing | |
| parent | ec13ef75260f6d143e947b0e5176e35e4c1229c2 (diff) | |
| parent | 9ec67362054e874ed905310a79b670941fa397af (diff) | |
| download | rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.gz rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.bz2 rails-0f28957edd6a9c281491c854b455180efc040a1c.zip | |
Merge remote-tracking branch 'upstream/master' into nofollow-change
Diffstat (limited to 'actionpack/lib/action_dispatch/system_testing')
| -rw-r--r-- | actionpack/lib/action_dispatch/system_testing/server.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/system_testing/server.rb b/actionpack/lib/action_dispatch/system_testing/server.rb index 32aa6a4dc4..8f1b6725b1 100644 --- a/actionpack/lib/action_dispatch/system_testing/server.rb +++ b/actionpack/lib/action_dispatch/system_testing/server.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "rack/handler/puma" - module ActionDispatch module SystemTesting class Server # :nodoc: |