aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2017-12-09 18:34:34 -0500
committerGitHub <noreply@github.com>2017-12-09 18:34:34 -0500
commit1b24fb213b820ebca29eb1d38efb07a410c7afaa (patch)
tree1a5318f23c7342d2980917a985277c61cf7204b6 /actionpack/CHANGELOG.md
parent5d7b70f4336d42eabfc403e9f6efceb88b3eff44 (diff)
parentf1b4cd1ad47eab55ab7b18ae0cc167fabf72f38b (diff)
downloadrails-1b24fb213b820ebca29eb1d38efb07a410c7afaa.tar.gz
rails-1b24fb213b820ebca29eb1d38efb07a410c7afaa.tar.bz2
rails-1b24fb213b820ebca29eb1d38efb07a410c7afaa.zip
Merge pull request #31384 from rails/dont-override-server
Change the system tests to set Puma as default server only when the user haven't specified manually another server.
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 209066ae07..384546d7b4 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Changed the system tests to set Puma as default server only when the
+ user haven't specified manually another server.
+
+ *Guillermo Iguaran*
+
* Add secure `X-Download-Options` and `X-Permitted-Cross-Domain-Policies` to
default headers set.