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 fast-forward PR bug #2137

Merged
merged 3 commits into from
Jul 11, 2017

Conversation

ethantkoenig
Copy link
Member

@ethantkoenig ethantkoenig commented Jul 11, 2017

Backport of #1989.

cc @bkcsoft

@lunny lunny added the type/bug label Jul 11, 2017
@lunny lunny added this to the 1.2.0 milestone Jul 11, 2017
@sapk
Copy link
Member

sapk commented Jul 11, 2017

Backport of #1843 it seems also.
LGTM

@tboerger tboerger added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jul 11, 2017
@appleboy
Copy link
Member

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 Jul 11, 2017
@appleboy appleboy merged commit 9a7f59e into go-gitea:release/v1.1 Jul 11, 2017
@lunny lunny modified the milestones: 1.1.3, 1.2.0 Jul 28, 2017
@ethantkoenig ethantkoenig deleted the backport/fix/merge_pr branch December 18, 2017 06:07
@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.

5 participants