Tidy up partner role. #592
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
all integration tests pass locally. |
neongreen
approved these changes
Jan 23, 2019
| @@ -6,6 +6,8 @@ | |||
| {-# LANGUAGE TypeFamilies #-} | |||
| {-# LANGUAGE ViewPatterns #-} | |||
|
|
|||
| {-# OPTIONS_GHC -Wno-orphans #-} | |||
There was a problem hiding this comment.
Can you write what instance this is needed for?
There was a problem hiding this comment.
oops, it's not. the instance popped up there briefly as quantum noise only. ok if i'll remove it in a separate PR to get this merged two hours earlier?
| where | ||
| invmetaJson :: (UserId, UTCTimeMillis) -> Value | ||
| invmetaJson (by, at) = object [ "by" .= by, "at" .= at ] | ||
| [ "created_by" .= (fst <$> _invitation m) ] <> |
There was a problem hiding this comment.
Is this a non-breaking change?
There was a problem hiding this comment.
All changes have been agreed on with the other teams.
Oh okay.
| @@ -515,13 +513,16 @@ parseTeamMember :: Value -> Parser TeamMember | |||
| parseTeamMember = withObject "team-member" $ \o -> | |||
| TeamMember <$> o .: "user" | |||
| <*> o .: "permissions" | |||
| <*> (parseInv =<< (o .:? "invited")) | |||
There was a problem hiding this comment.
So the "invited" field is not present anymore?
There was a problem hiding this comment.
All changes have been agreed on with the other teams.
Oh also okay.
|
Sure
…On Wed, Jan 23, 2019, 17:01 fisx ***@***.*** wrote:
***@***.**** commented on this pull request.
------------------------------
In libs/brig-types/test/unit/Test/Brig/Types/User.hs
<#592 (comment)>:
> @@ -6,6 +6,8 @@
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE ViewPatterns #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
oops, it's not. the instance popped up there briefly as quantum noise
only. ok if i'll remove it in a separate PR to get this merged two hours
earlier?
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#592 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ABc-aryx39yBgBs70XX3DPglgiyH7RIMks5vGIdYgaJpZM4aPET1>
.
|
Merged
fisx
added a commit
that referenced
this pull request
Jan 28, 2019
* Cleanup as promised here: #592 (comment) * Swagger: update docs, remove dead code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes will mess with staging only, since none of the features touched have seen master yet. All changes have been agreed on with the other teams.