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.

Sign up for GitHub

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

Jump to bottom

Don't allow merging PR's which are being conflict checked (#19357) #19358

Merged
merged 3 commits into from
Apr 12, 2022
Merged

Don't allow merging PR's which are being conflict checked (#19357) #19358

merged 3 commits into from
Apr 12, 2022

Commits on Apr 9, 2022

  1. Don't allow merging PR's which are being conflict checked (go-gitea#… 

    …19357)

- Backport of go-gitea#19357
  - When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR).
  - Resolves go-gitea#19352
    Gusted committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    a8be922 View commit details
    Browse the repository at this point in the history

  2. Update error message

    Gusted committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    e2f7574 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2022

  1. Merge branch 'release/v1.16' into backport-19357

    Gusted authored Apr 12, 2022
    Configuration menu
    Copy the full SHA
    2e899eb View commit details
    Browse the repository at this point in the history