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

Check for manual merging of a pull request #719

Merged
merged 1 commit into from
Feb 5, 2017

Conversation

Bwko
Copy link
Member

@Bwko Bwko commented Jan 22, 2017

When an open pull request got manually merged mark the pull request as merged
Fixes #283

@lunny lunny added this to the 1.1.0 milestone Jan 22, 2017
@lunny lunny added the type/bug label Jan 22, 2017
return err
}

if pr.Issue == nil {
Copy link
Member

Choose a reason for hiding this comment

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

LoadIssue() will check this, so it's no need.

When an open pull request got manually merged mark the pull request as
merged
@Bwko
Copy link
Member Author

Bwko commented Jan 25, 2017

@lunny done :)

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 25, 2017
@lunny
Copy link
Member

lunny commented Jan 26, 2017

LGTM

@tboerger tboerger 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 Jan 26, 2017
@appleboy
Copy link
Member

appleboy commented Feb 5, 2017

LGTM

@tboerger tboerger 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 Feb 5, 2017
@lunny lunny merged commit bf647ce into go-gitea:master Feb 5, 2017
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
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. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PR can't be merged after manual conflict resolution
4 participants