haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yesodweb/yesod

Browse Source
This commit is contained in:
Michael Snoyman 2016-05-25 08:40:49 +03:00
commit e39be76191
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yesod-auth/Yesod/Auth/Email.hs
View File

@ -142,6 +142,12 @@ class ( YesodAuth site
-- | Verify the email address on the given account. -- | Verify the email address on the given account.
-- --
-- __/Warning!/__ If you have persisted the @'AuthEmailId' site@
-- somewhere, this method should delete that key, or make it unusable
-- in some fashion. Otherwise, the same key can be used multiple times!
--
-- See <https://github.com/yesodweb/yesod/issues/1222>.
--
-- Since 1.1.0 -- Since 1.1.0
verifyAccount :: AuthEmailId site -> HandlerT site IO (Maybe (AuthId site)) verifyAccount :: AuthEmailId site -> HandlerT site IO (Maybe (AuthId site))

2
yesod-core/Yesod/Routes/Parse.hs
View File

@ -58,7 +58,7 @@ parseRoutesNoCheck = QuasiQuoter
{ quoteExp = lift . resourcesFromString { quoteExp = lift . resourcesFromString
} }
-- | Convert a multi-line string to a set of resources. See documentation for -- | Converts a multi-line string to a set of resources. See documentation for
-- the format of this string. This is a partial function which calls 'error' on -- the format of this string. This is a partial function which calls 'error' on
-- invalid input. -- invalid input.
resourcesFromString :: String -> [ResourceTree String] resourcesFromString :: String -> [ResourceTree String]