Add support for merging to restricted branches #106
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
asvoboda
approved these changes
Mar 26, 2019
README.md
Outdated
|
|
||
| ```yaml | ||
| options: | ||
| restriction_user_token: <token-value> |
There was a problem hiding this comment.
nit: I think the name should include push to match the existing struct's name: PushRestrictionMerger. Perhaps push_restriction_user_token?
| // this is not necessary: the normal client should have delete permissions, | ||
| // but having the merge user also delete the branch is a better UX | ||
| if restricted { | ||
| return m.Restricted.DeleteHead(ctx, pullCtx) |
There was a problem hiding this comment.
Do you think it would be valuable here to also log that we're performing a delete action and split it out by adding if we're using the restricted user token or not?
There was a problem hiding this comment.
The action is logged by the calling code, but I'll add a message about which client was selected.
Users can configure a personal access token for a normal user and Bulldozer will use that token to merge into protected branches with push restrictions. This configuration is optional and only used when push restrictions are active.
bluekeyes
force-pushed
the
bkeyes/oauth-tokens
branch
from
744ba82 to
2029be7
Compare
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.
Users can configure a personal access token for a normal user and Bulldozer will use that token to merge into protected branches with push restrictions. This configuration is optional and only used when push restrictions are active.
Fixes #98 and requires #105 to merge first.