From 3bf6a8959559c8d881953186a15f5cb9aac8f523 Mon Sep 17 00:00:00 2001 From: Maximilian Tagher Date: Fri, 29 Dec 2017 20:17:48 -0500 Subject: [PATCH 1/2] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c9839a31..e704b0be 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ Before submitting your PR, check that you've: - [ ] Bumped the version number - [ ] Documented new APIs with [Haddock markup](https://www.haskell.org/haddock/doc/html/index.html) -- [ ] Added [`@since` declarations](http://haskell-haddock.readthedocs.io/en/latest/markup.html#since) to the Haddock +- [ ] Added [`@since` declarations](http://haskell-haddock.readthedocs.io/en/latest/markup.html#since) to the Haddocks for new, public APIs After submitting your PR: @@ -11,4 +11,4 @@ After submitting your PR: \ No newline at end of file +_If these checkboxes don't apply to your PR, you can delete them_--> From ed40b136ea180f9dfa98708722e9472a79e39ae8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 30 Dec 2017 18:06:31 +0200 Subject: [PATCH 2/2] Fix broken Haddocks --- yesod-test/ChangeLog.md | 4 ++++ yesod-test/Yesod/Test.hs | 2 +- yesod-test/yesod-test.cabal | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/yesod-test/ChangeLog.md b/yesod-test/ChangeLog.md index 1a03a169..eb33c23a 100644 --- a/yesod-test/ChangeLog.md +++ b/yesod-test/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.5.9.1 + +* Fix broken Haddocks + ## 1.5.9 * Add byLabelExact and related functions [#1459](https://github.com/yesodweb/yesod/pull/1459) diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs index a9e474d3..307619cc 100644 --- a/yesod-test/Yesod/Test.hs +++ b/yesod-test/Yesod/Test.hs @@ -691,7 +691,7 @@ fileByLabel label path mime = do name <- genericNameFromLabel T.isInfixOf label addFile name path mime - -- | Finds the @\