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

Change how merged PR commit info are prepared #3368

Merged
merged 5 commits into from
Jan 19, 2018

Conversation

lafriks
Copy link
Member

@lafriks lafriks commented Jan 14, 2018

Fixes PR commit and diff display if PR is merged with squash or rebase. Fixes #3222

@lafriks lafriks added the type/enhancement An improvement of existing functionality label Jan 14, 2018
@lafriks lafriks added this to the 1.4.0 milestone Jan 14, 2018
@lafriks
Copy link
Member Author

lafriks commented Jan 14, 2018

Depends on go-gitea/git#107

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 14, 2018
@lafriks lafriks changed the title Change how merged PR commits and diff are made Change how merged PR commit info are prepared Jan 14, 2018
@codecov-io
Copy link

codecov-io commented Jan 14, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@b0d5bb9). Click here to learn what that means.
The diff coverage is 31.42%.

Impacted file tree graph

@@           Coverage Diff            @@
##             master   #3368   +/-   ##
========================================
  Coverage          ?   35.6%           
========================================
  Files             ?     281           
  Lines             ?   40554           
  Branches          ?       0           
========================================
  Hits              ?   14440           
  Misses            ?   23978           
  Partials          ?    2136
Impacted Files Coverage Δ
models/pull.go 51.98% <100%> (ø)
routers/repo/pull.go 35% <20%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b0d5bb9...9a872e9. Read the comment docs.

@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 14, 2018
Copy link
Contributor

@thehowl thehowl left a 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
Copy link
Contributor

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?

Copy link
Member

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

Copy link
Member Author

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

@thehowl
Copy link
Contributor

thehowl commented Jan 19, 2018

Alright. It's a LGTM from me then.

@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 Jan 19, 2018
@lafriks lafriks merged commit ca30698 into go-gitea:master Jan 19, 2018
@lafriks lafriks deleted the feat/diff_pull_ref branch January 19, 2018 06:18
@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/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Keep merged PR info in hidden branch
5 participants