6fc4c73 · typeable/servant

git.iko.soy/typeable/servant

Merge branch 'master' into query-param-method

commit6fc4c735c4e5b4cd187a5d63a6ff902fde1d1507 authorIvan Lazar Miljenovic <Ivan.Miljenovic@gmail.com> dateFri 28 Jul 2017, 22:52 (9 years ago) parent256ee41 53b3527

2 files changed+3−2

compare with master

unifiedsplit

servant-docs/src/Servant/Docs.hs+2−1 servant-docs/src/Servant/Docs/Internal.hs+1−1

servant-docs/src/Servant/Docs.hs+2−1

@@ -43,12 +43,13 @@ module Servant.Docs

4343 , -- * ADTs to represent an 'API'

4444 Endpoint, path, method, defEndpoint

4545 , API, apiIntros, apiEndpoints, emptyAPI

46+ , DocAuthentication(..), authIntro, authDataRequired

4647 , DocCapture(..), capSymbol, capDesc

4748 , DocQueryParam(..), ParamKind(..), paramName, paramValues, paramDesc, paramKind

4849 , DocNote(..), noteTitle, noteBody

4950 , DocIntro(..), introTitle, introBody

5051 , Response(..), respStatus, respTypes, respBody, defResponse

51− , Action, captures, headers, notes, params, rqtypes, rqbody, response, defAction

52+ , Action, authInfo, captures, headers, notes, params, rqtypes, rqbody, response, defAction

5253 , single

5354 ) where

5455

servant-docs/src/Servant/Docs/Internal.hs+1−1

@@ -264,7 +264,7 @@ combineAction :: Action -> Action -> Action

264264Action a c h p n m ts body resp `combineAction` Action a' c' h' p' n' m' _ _ _ =

265265 Action (a <> a') (c <> c') (h <> h') (p <> p') (n <> n') (m <> m') ts body resp

266266

267−-- Default 'Action'. Has no 'captures', no query 'params', expects

267+-- | Default 'Action'. Has no 'captures', no query 'params', expects

268268-- no request body ('rqbody') and the typical response is 'defResponse'.

269269--

270270-- Tweakable with lenses.