-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Change how merged PR commit info are prepared #3368
Conversation
Depends on go-gitea/git#107 |
Codecov Report
@@ Coverage Diff @@
## master #3368 +/- ##
========================================
Coverage ? 35.6%
========================================
Files ? 281
Lines ? 40554
Branches ? 0
========================================
Hits ? 14440
Misses ? 23978
Partials ? 2136
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a minor note
ctx.ServerError("Repo.GitRepo.FilesCountBetween", err) | ||
return | ||
if strings.Contains(err.Error(), "fatal: Not a valid object name") { | ||
ctx.Data["IsPullReuqestBroken"] = true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like there's a typo here (Reuqest
), although it is spread in the entire codebase. Can you change it now or do you think it's better to make another PR after this one is merged?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice catch, IMO a separate PR would be better
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also think it should be separate PR as this one fixes different issue and that change would make this one harder to review
Alright. It's a LGTM from me then. |
Fixes PR commit and diff display if PR is merged with squash or rebase. Fixes #3222