Merge master and fix conflicts

Author: erewok

.travis.yml

@@ -35,7 +35,34 @@ Some things we like:
 Though we aren't sticklers for style, the `.stylish-haskell.yaml` and `HLint.hs`
 files in the repository provide a good baseline for consistency.
 
-**Important**: please do not modify the changelog files nor the versions of the servant packages you are sending patches for. We take care of this before every release and do it uniformly for all the servant packages, so there's no need to worry about this for your pull requests.
+**Important**: please do not modify the versions of the servant packages you are sending patches for.
+
+## Changelog entries
+
+We experiment with using [changelog-d tool](https://github.com/phadej/changelog-d) to assemble changelogs.
+You are not required to install it.
+
+In each PR please add a file to `changelog.d` directory named after issue you are solving or the pull request itself (in a separate commit after you know the pull request number). For example
+
+```cabal
+synopsis: One sentence summary of the change.
+prs: #1219
+issues: #1028
+
+description: {
+
+A longer description. Small changes don't need this.
+Bigger ones definitely do, for example we try to include migration hints
+for breaking changes.
+
+However if you don't know what to write, that's ok too.
+
+By the way, the braces around are omitted when the file is parsed.
+They can be used so the field doesn't need to be indented, which is handy
+for prose.
+
+}
+```
 
 ## PR process
 

CONTRIBUTING.md

@@ -20,3 +20,13 @@ build-ghcjs :
 
 packdeps :
 	packdeps */*.cabal
+
+doctest : doctest-servant doctest-servant-server
+	perl -i -e 'while (<ARGV>) { print unless /package-id\s+base-compat-\d+(\.\d+)*/; }' .ghc.environment.*
+
+doctest-servant :
+	(cd servant && doctest src)
+	(cd servant && doctest test/Servant/LinksSpec.hs)
+
+doctest-servant-server :
+	(cd servant-server && doctest src)

Makefile

@@ -1,8 +1,12 @@
+distribution: bionic
 folds: all-but-test
 branches: master
 jobs-selection: any
 google-chrome: True
 ghcjs-tests: True
+doctest: True
+doctest-filter-packages: base-compat-batteries
+doctest-skip:            tutorial
 
 -- https://github.com/haskell/cabal/issues/6176
 ghcjs-tools: hspec-discover

cabal.haskell-ci

@@ -15,8 +15,8 @@ packages:
   servant-pipes/
 
 -- servant GHCJS
-packages:
-  servant-jsaddle/
+-- packages:
+--   servant-jsaddle/
 
 -- Cookbooks
 packages:
@@ -38,8 +38,6 @@ packages:
   doc/cookbook/using-free-client
   -- doc/cookbook/open-id-connect
 
-
-
 tests: True
 optimization: False
 -- reorder-goals: True
@@ -62,3 +60,8 @@ allow-newer: openssl-streams-1.2.2.0:network
 -- MonadFail
 -- https://github.com/nurpax/sqlite-simple/issues/74
 constraints: sqlite-simple < 0
+
+constraints: base-compat ^>=0.11
+
+-- needed for doctests
+write-ghc-environment-files: always

cabal.project

@@ -0,0 +1,2 @@
+organization: haskell-servant
+repository:   servant

changelog.d/config

@@ -0,0 +1,18 @@
+synopsis: Add NoContentVerb
+prs: #1228 #1219
+issues: #1028
+significance: significant
+
+description: {
+
+The `NoContent` API endpoints should now use `NoContentVerb` combinator.
+The API type changes are usually of the kind 
+
+```diff
+- :<|> PostNoContent '[JSON] NoContent
++ :<|> PostNoContent 
+```
+
+i.e. one doesn't need to specify the content-type anymore. There is no content.
+
+}

changelog.d/issue1028

@@ -0,0 +1,12 @@
+synopsis: Fix Verb with headers checking content type differently
+packages: servant-client-core servant-client
+prs: #1204
+issues: #1200
+packages: servant-client servant-client-core servant-http-streams
+
+description: {
+
+For `Verb`s with response `Headers`, the implementation didn't check
+for the content-type of the response. Now it does.
+
+}

changelog.d/issue1200

@@ -0,0 +1,16 @@
+synopsis: Merge documentation from duplicate routes
+packages: servant-docs
+prs: #1241
+issues: #1240
+
+description: {
+
+Servant supports defining the same route multiple times with different
+content-types and result-types, but servant-docs was only documenting
+the first of copy of such duplicated routes. It now combines the
+documentation from all the copies.
+
+Unfortunately, it is not yet possible for the documentation to specify
+multiple status codes.
+
+}

changelog.d/issue1240

@@ -0,0 +1,3 @@
+synopsis: Progress on servant-jsaddle
+packages: servant-jsaddle
+prs: #1216