Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

approval state of merge requests #766

Merged
merged 3 commits into from Feb 6, 2020

Conversation

granular-ryanbonham
Copy link
Contributor

Copy link
Member

@svanharmelen svanharmelen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two small comments, but should be easy to update after which this PR can be merged 👍

ContainsHiddenGroups bool `json:"contains_hidden_groups"`
ApprovedBy []*BasicUser `json:"approved_by"`
Approved bool `json:"approved"`
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not create a new struct, but instead add the missing fields to the MergeRequestApprovalRule struct and reuse that one here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

return nil, nil, err
}

var par *MergeRequestApprovalState
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe call this pas, for this is about the state, not a rule?

Suggested change
var par *MergeRequestApprovalState
var pas *MergeRequestApprovalState

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@granular-ryanbonham
Copy link
Contributor Author

I addressed both comments. Let me know if you want any other changes. Thanks

@sluongng
Copy link

sluongng commented Feb 6, 2020

Thanks for doing this. I made an ugly vendor patch downstream but didnt have time to merge back

Copy link
Member

@svanharmelen svanharmelen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Thanks @granular-ryanbonham!

@svanharmelen svanharmelen merged commit 90dd5e8 into xanzy:master Feb 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants