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

Fix being unable to use a repo that prohibits accepting PRs as a PR source. (#26785) #26793

Closed

Conversation

GiteaBot
Copy link
Contributor

Backport #26785 by @CaiCandong

Description

Sometimes, we need to use an upstream mirror repository to update the current development repository, but mirror repositories are prohibited from PR. It should not appear in merge to, but it can appear in pull from.
Fix #24585
Fix #26193
Fix #26781
Related #24183

Many thanks to @apnote for assisting me in reproducing this bug!

ScreenShot


Before

After

…ource. (go-gitea#26785)

## Description 
Sometimes, we need to use an upstream mirror repository to update the
current development repository, but mirror repositories are prohibited
from PR. It should not appear in `merge to,` but it can appear in `pull
from.`
Fix go-gitea#24585 go-gitea#26193 go-gitea#26781
Related go-gitea#24183

Many thanks to @apnote  for assisting me in reproducing this bug!

## ScreenShot
---
### Before

<img
src="https://github.com/go-gitea/gitea/assets/50507092/3d76c376-1f54-45b9-80c9-6ba8319d6a9a"
width="400px">

<img
src="https://github.com/go-gitea/gitea/assets/50507092/fbfd9f7f-421f-4a2e-9a3e-f2958bbf3312"
width="400px">

### After

<img
src="https://github.com/go-gitea/gitea/assets/50507092/e6984524-4f61-4310-b795-4d8598bd8963"
width="400px">

<img
src="https://github.com/go-gitea/gitea/assets/50507092/04065b44-78d7-4721-bf31-0f1674150727"
width="400px">
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 29, 2023
@GiteaBot GiteaBot added this to the 1.20.4 milestone Aug 29, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 29, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Aug 29, 2023
@lafriks
Copy link
Member

lafriks commented Aug 29, 2023

What happened to the diff? 🤔

@wxiaoguang
Copy link
Contributor

GitHub's bug, it makes GiteaBot creates duplicate PRs.

Copy link
Member

@puni9869 puni9869 left a comment

Choose a reason for hiding this comment

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

image

But approving

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Aug 29, 2023
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Aug 29, 2023

No, do not merge. The backport has been merged.

-> Fix being unable to use a repo that prohibits accepting PRs as a PR source. (#26785) #26790

@wxiaoguang wxiaoguang closed this Aug 29, 2023
@GiteaBot GiteaBot removed this from the 1.20.4 milestone Aug 29, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants