Merge branch 'master' into query-param-method

This commit is contained in:
Ivan Lazar Miljenovic 2017-07-28 22:52:34 +10:00 committed by GitHub
commit 6fc4c735c4
2 changed files with 3 additions and 2 deletions

View file

@ -43,12 +43,13 @@ module Servant.Docs
, -- * ADTs to represent an 'API'
Endpoint, path, method, defEndpoint
, API, apiIntros, apiEndpoints, emptyAPI
, DocAuthentication(..), authIntro, authDataRequired
, DocCapture(..), capSymbol, capDesc
, DocQueryParam(..), ParamKind(..), paramName, paramValues, paramDesc, paramKind
, DocNote(..), noteTitle, noteBody
, DocIntro(..), introTitle, introBody
, Response(..), respStatus, respTypes, respBody, defResponse
, Action, captures, headers, notes, params, rqtypes, rqbody, response, defAction
, Action, authInfo, captures, headers, notes, params, rqtypes, rqbody, response, defAction
, single
) where

View file

@ -264,7 +264,7 @@ combineAction :: Action -> Action -> Action
Action a c h p n m ts body resp `combineAction` Action a' c' h' p' n' m' _ _ _ =
Action (a <> a') (c <> c') (h <> h') (p <> p') (n <> n') (m <> m') ts body resp
-- Default 'Action'. Has no 'captures', no query 'params', expects
-- | Default 'Action'. Has no 'captures', no query 'params', expects
-- no request body ('rqbody') and the typical response is 'defResponse'.
--
-- Tweakable with lenses.