eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into query-param-method

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servant-docs/src/Servant/Docs.hs
View file

@ -43,12 +43,13 @@ module Servant.Docs
, -- * ADTs to represent an 'API' , -- * ADTs to represent an 'API'
Endpoint, path, method, defEndpoint Endpoint, path, method, defEndpoint
, API, apiIntros, apiEndpoints, emptyAPI , API, apiIntros, apiEndpoints, emptyAPI
, DocAuthentication(..), authIntro, authDataRequired
, DocCapture(..), capSymbol, capDesc , DocCapture(..), capSymbol, capDesc
, DocQueryParam(..), ParamKind(..), paramName, paramValues, paramDesc, paramKind , DocQueryParam(..), ParamKind(..), paramName, paramValues, paramDesc, paramKind
, DocNote(..), noteTitle, noteBody , DocNote(..), noteTitle, noteBody
, DocIntro(..), introTitle, introBody , DocIntro(..), introTitle, introBody
, Response(..), respStatus, respTypes, respBody, defResponse , 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 , single
) where ) where

2
servant-docs/src/Servant/Docs/Internal.hs
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 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 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'. -- no request body ('rqbody') and the typical response is 'defResponse'.
-- --
-- Tweakable with lenses. -- Tweakable with lenses.