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

Do not set author to null in merge command #155

Merged
merged 2 commits into from
Oct 15, 2021

Conversation

pfeuffer
Copy link
Member

Proposed changes

Fixes an internal server error for a simple merge. This error occured, because the merge service set null as the author for non-squash merges and this leads to a NullPointerException in the merge command builder.

Your checklist for this pull request

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

Contributor:

  • PR is well described and the description can be used as a commit message on squash
  • New code is covered with unit tests
  • Changelog entry file created in gradle/changelog or CHANGELOG.md is updated for plugins

Reviewer:

  • The clean code principles are respected (CleanCode)
  • All new code/logic is implemented on the right spot / "Should this be done here?"
  • UI changes fits into the layout
  • The UI views / components are responsive (mobile views)
  • Correct translations are available

Checklist for branch merge request (not required for forks)

@pfeuffer pfeuffer force-pushed the bugfix/null_author_in_merge branch from fb8ef27 to 9b32adf Compare October 15, 2021 11:53
@pfeuffer pfeuffer merged commit 40f1870 into develop Oct 15, 2021
@pfeuffer pfeuffer deleted the bugfix/null_author_in_merge branch October 15, 2021 12:37
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.

1 participant