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

feat: Add allow_force_push in ProtectedBranch #1051

Merged
merged 2 commits into from
Nov 11, 2023
Merged

feat: Add allow_force_push in ProtectedBranch #1051

merged 2 commits into from
Nov 11, 2023

Conversation

egore
Copy link
Contributor

@egore egore commented Nov 8, 2023

See https://docs.gitlab.com/ee/api/protected_branches.html

This also applies to the 6.x branch

Copy link
Collaborator

@jmini jmini left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Please also update the file src/test/resources/org/gitlab4j/api/protected-branch.json so that your change is also covered by unit tests.

Those example files should be as close as possible to the real response sent by GitLab (it can also be the example taken from the documentation page) just we do not support null values in the test, so you need to have one explicit value (with the appropriate type) for each attribute (even if in reality 2 attributes can not be set at the same time).

@jmini
Copy link
Collaborator

jmini commented Nov 9, 2023

This also applies to the 6.x branch

Yes according to our branching model (see #926) I am applying each change to both branches.
Targeting main is correct in your case.

Copy link
Collaborator

@jmini jmini left a comment

Choose a reason for hiding this comment

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

I have updated the example file

@jmini jmini merged commit 9aae1d8 into gitlab4j:main Nov 11, 2023
1 check passed
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.

2 participants