Skip to content

fix bug about can't skip commits base on base branch#11555

Merged
zeripath merged 9 commits into
go-gitea:masterfrom
a1012112796:fix_commit_his_comment
Jun 24, 2020
Merged

fix bug about can't skip commits base on base branch#11555
zeripath merged 9 commits into
go-gitea:masterfrom
a1012112796:fix_commit_his_comment

Conversation

@a1012112796
Copy link
Copy Markdown
Member

fix bug about can't skip commits base on base branch. I know it's not a good solution, but I have no other way now.

test with demo:

image

fix #11536

@techknowlogick techknowlogick added this to the 1.13.0 milestone May 22, 2020
@a1012112796
Copy link
Copy Markdown
Member Author

Please review, Thanks :)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 24, 2020
@6543
Copy link
Copy Markdown
Member

6543 commented Jun 8, 2020

O nice - will check it out 🎉

Comment thread modules/git/commit.go Outdated
Comment thread models/issue_comment.go Outdated
a1012112796 and others added 2 commits June 14, 2020 17:06
Co-authored-by: Lauris BH <lauris@nix.lv>
@6543
Copy link
Copy Markdown
Member

6543 commented Jun 18, 2020

I'm actualy just thinking how i can reproduce the bug to test your patch 🤔

@a1012112796
Copy link
Copy Markdown
Member Author

I'm actualy just thinking how i can reproduce the bug to test your patch 🤔

Maybe you can copy go-sdk to your test env with“New Migration”.

@6543
Copy link
Copy Markdown
Member

6543 commented Jun 24, 2020

finaly had time and could reproduce it - this works perfect :)

@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 Jun 24, 2020
@6543
Copy link
Copy Markdown
Member

6543 commented Jun 24, 2020

big thanks for fixing this anoying bug 👍

@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 Jun 24, 2020
@zeripath
Copy link
Copy Markdown
Contributor

make lg-tm work

@zeripath zeripath merged commit ae20de7 into go-gitea:master Jun 24, 2020
@a1012112796 a1012112796 deleted the fix_commit_his_comment branch June 25, 2020 01:48
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
* fix bug about can't skip commits base on base branch

Signed-off-by: a1012112796 <1012112796@qq.com>

* Update modules/git/commit.go

Co-authored-by: Lauris BH <lauris@nix.lv>

* Update models/issue_comment.go

Co-authored-by: Lauris BH <lauris@nix.lv>

* fix lint

Co-authored-by: Lauris BH <lauris@nix.lv>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 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.

[Bug] commits history comment on PR show unrelated after merge

7 participants